--- loncom/interface/lonfeedback.pm 2001/12/19 17:17:46 1.19 +++ loncom/interface/lonfeedback.pm 2003/08/06 17:00:30 1.50 @@ -1,7 +1,7 @@ # The LearningOnline Network # Feedback # -# $Id: lonfeedback.pm,v 1.19 2001/12/19 17:17:46 albertel Exp $ +# $Id: lonfeedback.pm,v 1.50 2003/08/06 17:00:30 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -39,8 +39,10 @@ # 2/13 Guy Albertelli # 7/25 Gerd Kortemeyer # 7/26 Guy Albertelli -# 7/26,8/10,10/1,11/5,11/6 Gerd Kortemeyer - +# 7/26,8/10,10/1,11/5,11/6,12/27,12/29 Gerd Kortemeyer +# YEAR=2002 +# 1/1,1/16 Gerd Kortemeyer +# package Apache::lonfeedback; @@ -48,9 +50,13 @@ use strict; use Apache::Constants qw(:common); use Apache::lonmsg(); use Apache::loncommon(); +use Apache::lontexconvert(); sub mail_screen { my ($r,$feedurl,$options) = @_; + my $bodytag=&Apache::loncommon::bodytag('Resource Feedback and Discussion', + '','onLoad="window.focus();"'); + my $latexHelp = Apache::loncommon::helpLatexCheatsheet(); $r->print(< @@ -98,23 +104,26 @@ sub mail_screen { } - - -

Feedback

+$bodytag

$feedurl

-
+ 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().''); } sub fail_redirect { @@ -134,7 +143,7 @@ ENDFAILREDIR } sub redirect_back { - my ($r,$feedurl,$typestyle,$sendsomething,$status) = @_; + my ($r,$feedurl,$typestyle,$sendsomething,$sendposts,$status) = @_; $r->print (< Feedback sent @@ -142,11 +151,13 @@ sub redirect_back { - + $typestyle -Sent $sendsomething message(s). +Sent $sendsomething message(s), and $sendposts post(s). $status +
+
ENDREDIR @@ -166,7 +177,7 @@ ENDNOREDIR $r->print (< - + Sorry, no feedback possible on this resource ... @@ -176,40 +187,47 @@ ENDNOREDIRTWO sub screen_header { my ($feedurl) = @_; - my $options=''; - if (($feedurl=~/^\/res/) && ($feedurl!~/^\/res\/adm/)) { - $options= + my $msgoptions=''; + my $discussoptions=''; + if (($feedurl=~/^\/res\//) && ($feedurl!~/^\/res\/adm/)) { + $msgoptions= '

Feedback to resource author'; } - if ($ENV{'course.'.$ENV{'request.course.id'}.'.question.email'}) { - $options.= + if (&feedback_available(1)) { + $msgoptions.= '
Question about resource content'; } - if ($ENV{'course.'.$ENV{'request.course.id'}.'.comment.email'}) { - $options.= + if (&feedback_available(0,1)) { + $msgoptions.= '
'. 'Question/Comment/Feedback about course content'; } - if ($ENV{'course.'.$ENV{'request.course.id'}.'.policy.email'}) { - $options.= + if (&feedback_available(0,0,1)) { + $msgoptions.= '
'. 'Question/Comment/Feedback about course policy'; } + if ($ENV{'request.course.id'}) { - $options.='
'. - 'Contribution to course discussion of resource'; - } - if ($ENV{'request.course.id'}) { - $options.='
'. - 'Anonymous contribution to course discussion of resource'. - ' (name only visible to course faculty)'; + if (&Apache::lonnet::allowed('pch', + $ENV{'request.course.id'}. + ($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:''))) { + $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; @@ -221,14 +239,29 @@ sub resource_output { } sub clear_out_html { - my $message=$ENV{'form.comment'}; - $message=~s/\/\>\;/g; + my ($message,$override)=@_; + my $cid=$ENV{'request.course.id'}; + 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; + $message =~ s/(\]*)\>/ + {($html{uc($2)}&&(length($1)<1000))?"$1\>":"$1\>"}/ge; + } else { + $message=~s/\<\/*m\s*\>//g; + $message=~s/\/\>\;/g; + } return $message; } sub assemble_email { - my ($feedurl,$message,$prevattempts,$usersaw)=@_; + my ($feedurl,$message,$prevattempts,$usersaw,$useranswer)=@_; my $email=<<"ENDEMAIL"; Refers to $feedurl @@ -240,57 +273,96 @@ $prevattempts

        Original screen output (if applicable)

        $usersaw +

        Correct Answer(s) (if applicable)

        +$useranswer ENDCITE return ($email,$citations); } +sub secapply { + my $rec=shift; + my $defaultflag=shift; + $rec=~s/\s+//g; + $rec=~s/\@/\:/g; + my ($adr,$sections)=($rec=~/^([^\(]+)\(([^\)]+)\)/); + if ($sections) { + foreach (split(/\;/,$sections)) { + if (($_ eq $ENV{'request.course.sec'}) || + ($defaultflag && ($_ eq '*'))) { + return $adr; + } + } + } else { + return $rec; + } + return ''; +} + sub decide_receiver { - my ($feedurl) = @_; + my ($feedurl,$author,$question,$course,$policy,$defaultflag) = @_; my $typestyle=''; my %to=(); - if ($ENV{'form.author'}) { + if ($ENV{'form.author'}||$author) { $typestyle.='Submitting as Author Feedback
        '; $feedurl=~/^\/res\/(\w+)\/(\w+)\//; $to{$2.':'.$1}=1; } - if ($ENV{'form.question'}) { + if ($ENV{'form.question'}||$question) { $typestyle.='Submitting as Question
        '; - map { - $to{$_}=1; - } split(/\,/, - $ENV{'course.'.$ENV{'request.course.id'}.'.question.email'}); + foreach (split(/\,/, + $ENV{'course.'.$ENV{'request.course.id'}.'.question.email'}) + ) { + my $rec=&secapply($_,$defaultflag); + if ($rec) { $to{$rec}=1; } + } } - if ($ENV{'form.course'}) { + if ($ENV{'form.course'}||$course) { $typestyle.='Submitting as Comment
        '; - map { - $to{$_}=1; - } split(/\,/, - $ENV{'course.'.$ENV{'request.course.id'}.'.comment.email'}); + foreach (split(/\,/, + $ENV{'course.'.$ENV{'request.course.id'}.'.comment.email'}) + ) { + my $rec=&secapply($_,$defaultflag); + if ($rec) { $to{$rec}=1; } + } } - if ($ENV{'form.policy'}) { + if ($ENV{'form.policy'}||$policy) { $typestyle.='Submitting as Policy Feedback
        '; - map { - $to{$_}=1; - } split(/\,/, - $ENV{'course.'.$ENV{'request.course.id'}.'.policy.email'}); + foreach (split(/\,/, + $ENV{'course.'.$ENV{'request.course.id'}.'.policy.email'}) + ) { + my $rec=&secapply($_,$defaultflag); + if ($rec) { $to{$rec}=1; } + } + } + if ((scalar(%to) eq '0') && (!$defaultflag)) { + ($typestyle,%to)= + &decide_receiver($feedurl,$author,$question,$course,$policy,1); } return ($typestyle,%to); } +sub feedback_available { + my ($question,$course,$policy)=@_; + my ($typestyle,%to)=&decide_receiver('',0,$question,$course,$policy); + return scalar(%to); +} + sub send_msg { - my ($feedurl,$email,$citations,%to)=@_; + my ($feedurl,$email,$citations,$attachmenturl,%to)=@_; my $status=''; my $sendsomething=0; - map { + foreach (keys %to) { if ($_) { + my $declutter=&Apache::lonnet::declutter($feedurl); unless (&Apache::lonmsg::user_normal_msg(split(/\:/,$_), - 'Feedback '.$feedurl,$email,$citations) eq 'ok') { + 'Feedback ['.$declutter.']',$email,$citations,$feedurl, + $attachmenturl)=~/ok/) { $status.='
        Error sending message to '.$_.'
        '; } else { $sendsomething++; } } - } keys %to; + } my %record=&Apache::lonnet::restore('_feedback'); my ($temp)=keys %record; @@ -307,11 +379,20 @@ 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'}:''))) { + my %contrib=('message' => $email, 'sendername' => $ENV{'user.name'}, - 'senderdomain' => $ENV{'user.domain'}); + 'senderdomain' => $ENV{'user.domain'}, + 'screenname' => $ENV{'environment.screenname'}, + 'plainname' => $ENV{'environment.firstname'}.' '. + $ENV{'environment.middlename'}.' '. + $ENV{'environment.lastname'}.' '. + $ENV{'enrironment.generation'}, + 'attachmenturl'=> $attachmenturl); if ($anon) { $contrib{'anonymous'}='true'; } @@ -320,6 +401,11 @@ sub adddiscuss { &Apache::lonnet::store(\%contrib,$symb,$ENV{'request.course.id'}, $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}, $ENV{'course.'.$ENV{'request.course.id'}.'.num'}); + my %storenewentry=($symb => time); + $status.='
        Updating discussion time: '. + &Apache::lonnet::put('discussiontimes',\%storenewentry, + $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}, + $ENV{'course.'.$ENV{'request.course.id'}.'.num'}); } my %record=&Apache::lonnet::restore('_discussion'); my ($temp)=keys %record; @@ -327,11 +413,35 @@ sub adddiscuss { my %newrecord=(); $newrecord{'resource'}=$symb; $newrecord{'subnumber'}=$record{'subnumber'}+1; - $status.=' '.&Apache::lonnet::cstore(\%newrecord,'_discussion'); + $status.='
        Registering: '. + &Apache::lonnet::cstore(\%newrecord,'_discussion'); + } + } else { + $status.='Failed.'; } return $status.'
        '; } +# ----------------------------------------------------------- Preview function + +sub show_preview { + my $r=shift; + my $message=&clear_out_html($ENV{'form.comment'}); + $message=~s/\n/\
        /g; + $message=&Apache::lontexconvert::msgtexconverted($message); + $r->print('
        '. + $message.'
        '); +} + +sub generate_preview_button { + return(< + + + +ENDPREVIEW +} sub handler { my $r = shift; if ($r->header_only) { @@ -342,16 +452,8 @@ sub handler { # --------------------------- Get query string for limited number of parameters - map { - my ($name, $value) = split(/=/,$_); - $value =~ tr/+/ /; - $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg; - if (($name eq 'hide') || ($name eq 'unhide')) { - unless ($ENV{'form.'.$name}) { - $ENV{'form.'.$name}=$value; - } - } - } (split(/&/,$ENV{'QUERY_STRING'})); + &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, + ['hide','unhide','deldisc','postdata','preview']); if (($ENV{'form.hide'}) || ($ENV{'form.unhide'})) { # ----------------------------------------------------------------- Hide/unhide @@ -381,9 +483,38 @@ sub handler { $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}, $ENV{'course.'.$ENV{'request.course.id'}.'.num'}); - &redirect_back($r,'/res/'.$url,'Changed discussion status

        ','0'); + &redirect_back($r,&Apache::lonnet::clutter($url), + 'Changed discussion status

        ','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

        ','0','0'); + } elsif ($ENV{'form.preview'}) { +# -------------------------------------------------------- User wants a preview + &show_preview($r); } else { # ------------------------------------------------------------- Normal feedback my $feedurl=$ENV{'form.postdata'}; @@ -392,6 +523,13 @@ sub handler { $feedurl=~s/^$ENV{'HTTP_HOST'}//; my $symb=&Apache::lonnet::symbread($feedurl); + unless ($symb) { + $symb=$ENV{'form.symb'}; + if ($symb) { + my ($map,$id,$url)=split(/\_\_\_/,$symb); + $feedurl=&Apache::lonnet::clutter($url); + } + } my $goahead=1; if ($feedurl=~/\.(problem|exam|quiz|assess|survey|form)$/) { unless ($symb) { $goahead=0; } @@ -408,6 +546,8 @@ sub handler { ) || ($ENV{'request.course.id'} && ($feedurl!~m:^/adm:)) + || + ($ENV{'request.course.id'} && ($symb=~/^bulletin\_\_\_/)) ) { # --------------------------------------------------- Print login screen header unless ($ENV{'form.sendit'}) { @@ -427,32 +567,49 @@ 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++; } # Receipt screen and redirect back to where came from - &redirect_back($r,$feedurl,$typestyle,$numsent,$status); + &redirect_back($r,$feedurl,$typestyle,$numsent,$numpost,$status); } } else { @@ -469,7 +626,3 @@ sub handler { 1; __END__ - - - -