--- loncom/interface/lonfeedback.pm 2001/07/25 16:08:38 1.10 +++ loncom/interface/lonfeedback.pm 2004/06/03 20:28:22 1.90 @@ -1,19 +1,31 @@ # The LearningOnline Network # Feedback # -# (Internal Server Error Handler +# $Id: lonfeedback.pm,v 1.90 2004/06/03 20:28:22 albertel Exp $ # -# (Login Screen -# 5/21/99,5/22,5/25,5/26,5/31,6/2,6/10,7/12,7/14, -# 1/14/00,5/29,5/30,6/1,6/29,7/1,11/9 Gerd Kortemeyer) +# Copyright Michigan State University Board of Trustees # -# 3/1/1 Gerd Kortemeyer) +# This file is part of the LearningOnline Network with CAPA (LON-CAPA). # -# 3/1,2/3,2/5,2/6,2/8 Gerd Kortemeyer -# 2/9 Guy Albertelli -# 2/10 Gerd Kortemeyer -# 2/13 Guy Albertelli -# 7/25 Gerd Kortemeyer +# LON-CAPA is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# LON-CAPA is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with LON-CAPA; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# /home/httpd/html/adm/gpl.txt +# +# http://www.lon-capa.org/ +# +### package Apache::lonfeedback; @@ -21,80 +33,540 @@ use strict; use Apache::Constants qw(:common); use Apache::lonmsg(); use Apache::loncommon(); +use Apache::lontexconvert(); +use Apache::lonlocal; # must not have () +use Apache::lonhtmlcommon(); + +sub discussion_closed { + my ($status)=@_; + if (!($status eq 'CAN_ANSWER' || $status eq 'CANNOT_ANSWER' + || $status eq 'OPEN')) { + return '1'; + } + my $close=&Apache::lonnet::EXT('resource.0.discussend'); + if (defined($close) && $close ne '' && $close < time) { + return '1' + } + return 0; +} + +sub list_discussion { + my ($mode,$status,$symb)=@_; + + if (&discussion_closed($status)) { + return ''; + } + my @bgcols = ("#cccccc","#eeeeee"); + my $discussiononly=0; + if ($mode eq 'board') { $discussiononly=1; } + unless ($ENV{'request.course.id'}) { return ''; } + my $crs='/'.$ENV{'request.course.id'}; + if ($ENV{'request.course.sec'}) { + $crs.='_'.$ENV{'request.course.sec'}; + } + $crs=~s/\_/\//g; + unless ($symb) { + $symb=&Apache::lonnet::symbread(); + } + unless ($symb) { return ''; } + +# backward compatibility (bulletin boards used to be 'wrapped') + my $ressymb=$symb; + if ($mode eq 'board') { + unless ($ressymb =~ m|bulletin___\d+___adm/wrapper|) { + $ressymb=~s|(bulletin___\d+___)|$1adm/wrapper|; + } + } + +# Get discussion display settings for this discussion + my $lastkey = $ressymb.'_lastread'; + my $showkey = $ressymb.'_showonlyunread'; + my $visitkey = $ressymb.'_visit'; + my $ondispkey = $ressymb.'_markondisp'; + my %dischash = &Apache::lonnet::get('nohist_'.$ENV{'request.course.id'}.'_discuss',[$lastkey,$showkey,$visitkey,$ondispkey],$ENV{'user.domain'},$ENV{'user.name'}); + my %discinfo = (); + my $showonlyunread = 0; + my $markondisp = 0; + my $prevread = 0; + my $previous = 0; + my $visit = 0; + my $newpostsflag = 0; + +# Retain identification of "NEW" posts identified in last display, if continuing 'previous' browsing of posts. + &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['previous']); + $previous = $ENV{'form.previous'}; + if ($previous > 0) { + $prevread = $previous; + } elsif (defined($dischash{$lastkey})) { + unless ($dischash{$lastkey} eq '') { + $prevread = $dischash{$lastkey}; + } + } + +# Get discussion display default settings for user + my %userenv = &Apache::lonnet::get('environment',['discdisplay','discmarkread'],$ENV{'user.domain'},$ENV{'user.name'}); + my $discdisplay=$userenv{'discdisplay'}; + if ($discdisplay eq 'unread') { + $showonlyunread = 1; + } + my $discmarkread=$userenv{'discmarkread'}; + if ($discmarkread eq 'ondisp') { + $markondisp = 1; + } + +# Override user's default if user specified display setting for this discussion + if (defined($dischash{$ondispkey})) { + $markondisp = $dischash{$ondispkey}; + } + if ($markondisp) { + $discinfo{$lastkey} = time; + } + + if (defined($dischash{$showkey})) { + $showonlyunread = $dischash{$showkey}; + } + + if (defined($dischash{$visitkey})) { + $visit = $dischash{$visitkey}; + } + $visit ++; + + my $seeid=&Apache::lonnet::allowed('rin',$crs); + my $viewgrades=(&Apache::lonnet::allowed('vgr',$crs) + && ($symb=~/\.(problem|exam|quiz|assess|survey|form)$/)); + my @discussionitems=(); + my %contrib=&Apache::lonnet::restore($ressymb,$ENV{'request.course.id'}, + $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}, + $ENV{'course.'.$ENV{'request.course.id'}.'.num'}); + my $visible=0; + my @depth=(); + my @original=(); + my @index=(); + my @replies=(); + my %alldiscussion=(); + my %notshown = (); + my %newitem = (); + my $maxdepth=0; + + my $target=''; + unless ($ENV{'browser.interface'} eq 'textual' || + $ENV{'environment.remote'} eq 'off' ) { + $target='target="LONcom"'; + } + + my $now = time; + $discinfo{$visitkey} = $visit; + + &Apache::lonnet::put('nohist_'.$ENV{'request.course.id'}.'_discuss',\%discinfo,$ENV{'user.domain'},$ENV{'user.name'}); + + if ($contrib{'version'}) { + my $oldest = $contrib{'1:timestamp'}; + if ($prevread eq '0') { + $prevread = $oldest-1; + } + for (my $id=1;$id<=$contrib{'version'};$id++) { + my $idx=$id; + my $posttime = $contrib{$idx.':timestamp'}; + if ($prevread <= $posttime) { + $newpostsflag = 1; + } + my $hidden=($contrib{'hidden'}=~/\.$idx\./); + my $deleted=($contrib{'deleted'}=~/\.$idx\./); + my $origindex='0.'; + if (($contrib{$idx.':replyto'}) && ($ENV{'environment.threadeddiscussion'})) { +# this is a follow-up message + $original[$idx]=$original[$contrib{$idx.':replyto'}]; + $depth[$idx]=$depth[$contrib{$idx.':replyto'}]+1; + $origindex=$index[$contrib{$idx.':replyto'}]; + if ($depth[$idx]>$maxdepth) { $maxdepth=$depth[$idx]; } + } else { +# this is an original message + $original[$idx]=0; + $depth[$idx]=0; + } + if ($replies[$depth[$idx]]) { + $replies[$depth[$idx]]++; + } else { + $replies[$depth[$idx]]=1; + } + unless ((($hidden) && (!$seeid)) || ($deleted)) { + $visible++; + my $message=$contrib{$idx.':message'}; + $message=~s/\n/\
/g; + $message=&Apache::lontexconvert::msgtexconverted($message); + my $subject=$contrib{$idx.':subject'}; + if (defined($subject)) { + $subject=~s/\n/\
/g; + $subject=&Apache::lontexconvert::msgtexconverted($subject); + } + if ($contrib{$idx.':attachmenturl'}) { + my ($fname) + =($contrib{$idx.':attachmenturl'}=~m|/([^/]+)$|); + &Apache::lonnet::allowuploaded('/adm/feedback', + $contrib{$idx.':attachmenturl'}); + $message.='

'.&mt('Attachment'). + ': '. + $fname.'

'; + } + if ($message) { + if ($hidden) { + $message=''.$message.''; + } + my $screenname=&Apache::loncommon::screenname( + $contrib{$idx.':sendername'}, + $contrib{$idx.':senderdomain'}); + my $plainname=&Apache::loncommon::nickname( + $contrib{$idx.':sendername'}, + $contrib{$idx.':senderdomain'}); + + my $sender=&mt('Anonymous'); + if ((!$contrib{$idx.':anonymous'}) || ($seeid)) { + $sender=&Apache::loncommon::aboutmewrapper( + $plainname, + $contrib{$idx.':sendername'}, + $contrib{$idx.':senderdomain'}).' ('. + $contrib{$idx.':sendername'}.' at '. + $contrib{$idx.':senderdomain'}.')'; + if ($contrib{$idx.':anonymous'}) { + $sender.=' ['.&mt('anonymous').'] '. + $screenname; + } + if ($seeid) { + if ($hidden) { + $sender.=' '.&mt('Make Visible').''; + } else { + $sender.=' '.&mt('Hide').''; + } + $sender.=' '.&mt('Delete').''; + } + } else { + if ($screenname) { + $sender=''.$screenname.''; + } + } + if (!&discusion_closed($status) && + &Apache::lonnet::allowed('pch', + $ENV{'request.course.id'}. + ($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:''))) { + $sender.=' '.&mt('Reply').''; + } + my $vgrlink; + if ($viewgrades) { + $vgrlink=&Apache::loncommon::submlink('Submissions', + $contrib{$idx.':sendername'},$contrib{$idx.':senderdomain'},$symb); + } +#figure out at what position this needs to print + my $thisindex=$idx; + if ($ENV{'environment.threadeddiscussion'}) { + $thisindex=$origindex.substr('00'.$replies[$depth[$idx]],-2,2); + } + $alldiscussion{$thisindex}=$idx; + $index[$idx]=$thisindex; + my $spansize = 2; + if ($showonlyunread && $prevread > $posttime) { + $notshown{$idx} = 1; + } else { + if ($prevread > 0 && $prevread <= $posttime) { + $newitem{$idx} = 1; + $discussionitems[$idx] .= ' +

+ '; + } else { + $newitem{$idx} = 0; + $discussionitems[$idx] .= ' +

NEW
+ '; + } + $discussionitems[$idx] .= ''. + '
   '. + ''.$subject.'  '. + $sender.' '.$vgrlink.' ('. + localtime($posttime).')

'.$message.'

'; + } + } + } + } + } + + my $discussion=''; + + my $function = &Apache::loncommon::get_users_function(); + my $color = &Apache::loncommon::designparm($function.'.tabbg', + $ENV{'user.domain'}); + my %lt = &Apache::lonlocal::texthash( + 'cuse' => 'Current settings for this discussion', + 'allposts' => 'All posts', + 'unread' => 'New posts only', + 'ondisp' => 'Once displayed', + 'onmark' => 'Once marked read', + 'disa' => 'Posts to be displayed', + 'npce' => 'Posts cease to be marked "NEW"', + 'chgt' => 'Change to ', + ); + + my $currdisp = $lt{'allposts'}; + my $currmark = $lt{'onmark'}; + my $dispchange = $lt{'unread'}; + my $markchange = $lt{'ondisp'}; + my $displink = '/adm/feedback?onlyunread='.$ressymb; + my $marklink = '/adm/feedback?markondisp='.$ressymb; + + if ($markondisp) { + $currmark = $lt{'ondisp'}; + $markchange = $lt{'onmark'}; + $marklink = '/adm/feedback?markonread='.$ressymb; + if ($newpostsflag) { + $marklink .= '&previous='.$prevread; + } + } + + if ($showonlyunread) { + $currdisp = $lt{'unread'}; + $dispchange = $lt{'allposts'}; + $displink = '/adm/feedback?allposts='.$ressymb; + } + + if ($newpostsflag) { + $displink .= '&previous='.$prevread; + } + + if ($visible) { +# Print the discusssion + $discussion.=''; + my $colspan=$maxdepth+1; + $discussion .= ''. + ''; + + my $numhidden = keys %notshown; + if ($numhidden > 0) { + my $colspan = $maxdepth+1; + $discussion.="\n".''; + } + foreach (sort { $a <=> $b } keys %alldiscussion) { + unless ($notshown{$alldiscussion{$_}} eq '1') { + $discussion.="\n"; + my $thisdepth=$depth[$alldiscussion{$_}]; + for (1..$thisdepth) { + $discussion.=''; + } + my $colspan=$maxdepth-$thisdepth+1; + $discussion.=''; + } + } + $discussion.='
'. + ''. + ''. + ''. + ''. + '
'.$lt{'cuse'}.'    '.$lt{'chgt'}.'
'.$lt{'disa'}.': '.$currdisp.'    '.$dispchange.'
'.$lt{'npce'}.': '.$currmark.'    '.$markchange.'
'. + ''; + if ($visible>2) { + $discussion.=''; + } + if ($newpostsflag) { + if (!$markondisp) { + $discussion .=''; + } + } else { + $discussion .= ''; + } + $discussion .= '
'. + ''.&mt('Threaded View').'  '. + ''.&mt('Chronological View').'  '.&mt('Mark new posts as read').'  '; + } else { + $discussion .= '  
'. + ''.&mt('Show all posts').' '.&mt('to display').' '. + $numhidden.' '.&mt('previously viewed posts'). + '
   '. + $discussionitems[$alldiscussion{$_}]. + '


'; + } + if ($discussiononly) { + $discussion.=(< + + + + +
+Note: in anonymous discussion, your name is visible only to +course faculty
+Title: 

+ +

+Attachment (128 KB max size): +

+ +ENDDISCUSS + $discussion.=&generate_preview_button(); + } else { + if (!&discussion_closed($status) && + &Apache::lonnet::allowed('pch', + $ENV{'request.course.id'}. + ($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:''))) { + $discussion.='
'. + ''. + &mt('Post Discussion').'
'; + } + } + return $discussion; +} 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 $quote=''; + my $subject = ''; + my $prevtag = ''; + if ($ENV{'form.replydisc'}) { + my ($symb,$idx)=split(/\:\:\:/,$ENV{'form.replydisc'}); + my %contrib=&Apache::lonnet::restore($symb,$ENV{'request.course.id'}, + $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}, + $ENV{'course.'.$ENV{'request.course.id'}.'.num'}); + unless (($contrib{'hidden'}=~/\.$idx\./) || ($contrib{'deleted'}=~/\.$idx\./)) { + my $message=$contrib{$idx.':message'}; + $message=~s/\n/\
/g; + $quote='
'.&Apache::lontexconvert::msgtexconverted($message).'
'; + if ($idx > 0) { + $subject = 'Re: '.$contrib{$idx.':subject'}; + } + } + if ($ENV{'form.previous'}) { + $prevtag = ''; + } + } + my $latexHelp=&Apache::loncommon::helpLatexCheatsheet(); + my $htmlheader=&Apache::lonhtmlcommon::htmlareaheaders(); + my $send=&mt('Send'); $r->print(< The LearningOnline Network with CAPA - - - -

Feedback

-

$feedurl

-
- +$bodytag +

$title

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

-

- - +$options


+$quote +

My question/comment/feedback:

+

+$latexHelp +Title:

+

+

+

+Attachment (128 KB max size): +

+

+ + +

- - ENDDOCUMENT +$r->print(&generate_preview_button(). +&Apache::lonhtmlcommon::htmlareaactive(). +''); } sub fail_redirect { my ($r,$feedurl) = @_; + if ($feedurl=~/^\/adm\//) { $feedurl.='?register=1' }; $r->print (< Feedback not sent - - + + - - + Sorry, no recipients ... @@ -102,19 +574,34 @@ ENDFAILREDIR } sub redirect_back { - my ($r,$feedurl,$typestyle,$sendsomething,$status) = @_; + my ($r,$feedurl,$typestyle,$sendsomething,$sendposts,$status,$previous) = @_; + my $prevtag = ''; + my $qrystr = ''; + if ($feedurl=~/^\/adm\//) { $feedurl.='?register=1' }; + if ($previous > 0) { + $qrystr = 'previous='.$previous; + if ($feedurl =~ /\?register=1/) { + $feedurl .= '&'.$qrystr; + } else { + $feedurl .= '?'.$qrystr; + } + $prevtag = ''; + } $r->print (< Feedback sent - - + + - - - + + $typestyle -Sent $sendsomething message(s). -$status +Sent $sendsomething message(s), and $sendposts post(s). +$status +
+$prevtag +
ENDREDIR @@ -123,8 +610,9 @@ ENDREDIR sub no_redirect_back { my ($r,$feedurl) = @_; $r->print (< Feedback not sent - + ENDNOREDIR if ($feedurl!~/^\/adm\/feedback/) { @@ -133,9 +621,8 @@ ENDNOREDIR $r->print (< - - - + + Sorry, no feedback possible on this resource ... @@ -143,36 +630,53 @@ ENDNOREDIRTWO } sub screen_header { - my ($feedurl) = @_; - my $options=''; - if (($feedurl=~/^\/res/) && ($feedurl!~/^\/res\/adm/)) { - $options= - '

Feedback to resource author'; - } - if ($ENV{'course.'.$ENV{'request.course.id'}.'.question.email'}) { - $options.= - '
Question about resource content'; - } - if ($ENV{'course.'.$ENV{'request.course.id'}.'.comment.email'}) { - $options.= - '
'. - 'Question/Comment/Feedback about course content'; - } - if ($ENV{'course.'.$ENV{'request.course.id'}.'.policy.email'}) { - $options.= - '
'. - 'Question/Comment/Feedback about course policy'; - } - if ($ENV{'request.course.id'}) { - $options.='
'. - 'Contribution to course discussion of resource'; - } - return $options; + my ($feedurl) = @_; + my $msgoptions=''; + my $discussoptions=''; + unless ($ENV{'form.replydisc'}) { + if (($feedurl=~/^\/res\//) && ($feedurl!~/^\/res\/adm/)) { + $msgoptions= + '

'. + &mt('Feedback to resource author').'

'; + } + if (&feedback_available(1)) { + $msgoptions.= + '
'. + &mt('Question about resource content'); + } + if (&feedback_available(0,1)) { + $msgoptions.= + '
'. + &mt('Question/Comment/Feedback about course content'); + } + if (&feedback_available(0,0,1)) { + $msgoptions.= + '
'. + &mt('Question/Comment/Feedback about course policy'); + } + } + if ($ENV{'request.course.id'}) { + if (not &discussion_closed() && + &Apache::lonnet::allowed('pch', + $ENV{'request.course.id'}. + ($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:''))) { + $discussoptions=' '. + &mt('Contribution to course discussion of resource'); + $discussoptions.='
'. + &mt('Anonymous contribution to course discussion of resource'). + ' ('.&mt('name only visible to course faculty').')'; + } + } + if ($msgoptions) { $msgoptions='

'.&mt('Sending Messages').'

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

'.&mt('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; @@ -184,14 +688,32 @@ sub resource_output { } sub clear_out_html { - my $message=$ENV{'form.comment'}; - $message=~s/\/\>\;/g; + my ($message,$override)=@_; + unless (&Apache::lonhtmlcommon::htmlareablocked()) { return $message; } + 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, + M=>1, SUB=>1, SUP=>1, SPAN=>1, + H1=>1, H2=>1, H3=>1, H4=>1, H5=>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/\/\>\;/g; + } return $message; } sub assemble_email { - my ($feedurl,$message,$prevattempts,$usersaw)=@_; + my ($feedurl,$message,$prevattempts,$usersaw,$useranswer)=@_; my $email=<<"ENDEMAIL"; Refers to $feedurl @@ -200,86 +722,379 @@ ENDEMAIL my $citations=<<"ENDCITE";

        Previous attempts of student (if applicable)

        $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'}); - } - if ($ENV{'form.course'}) { - $typestyle.='Submitting as Comment
        '; - map { - $to{$_}=1; - } split(/\,/, - $ENV{'course.'.$ENV{'request.course.id'}.'.comment.email'}); - } - if ($ENV{'form.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'}.'.question.email'}) + ) { + my $rec=&secapply($_,$defaultflag); + if ($rec) { $to{$rec}=1; } + } + } + if ($ENV{'form.course'}||$course) { + $typestyle.='Submitting as Comment
        '; + foreach (split(/\,/, + $ENV{'course.'.$ENV{'request.course.id'}.'.comment.email'}) + ) { + my $rec=&secapply($_,$defaultflag); + if ($rec) { $to{$rec}=1; } + } + } + if ($ENV{'form.policy'}||$policy) { + $typestyle.='Submitting as Policy Feedback
        '; + 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') { - $status.='
        Error sending message to '.$_.'
        '; + 'Feedback ['.$declutter.']',$email,$citations,$feedurl, + $attachmenturl)=~/ok/) { + $status.='
        '.&mt('Error sending message to').' '.$_.'
        '; } else { - #$status.='
        Message sent to '.$_.'
        '; $sendsomething++; } } - } keys %to; + } + + my %record=&Apache::lonnet::restore('_feedback'); + my ($temp)=keys %record; + unless ($temp=~/^error\:/) { + my %newrecord=(); + $newrecord{'resource'}=$feedurl; + $newrecord{'subnumber'}=$record{'subnumber'}+1; + unless (&Apache::lonnet::cstore(\%newrecord,'_feedback') eq 'ok') { + $status.='
        '.&mt('Not registered').'
        '; + } + } + return ($status,$sendsomething); } +sub adddiscuss { + my ($symb,$email,$anon,$attachmenturl,$subject)=@_; + my $status=''; + if (not &discussion_closed() && + &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'}, + 'screenname' => $ENV{'environment.screenname'}, + 'plainname' => $ENV{'environment.firstname'}.' '. + $ENV{'environment.middlename'}.' '. + $ENV{'environment.lastname'}.' '. + $ENV{'enrironment.generation'}, + 'attachmenturl'=> $attachmenturl, + 'subject' => $subject); + if ($ENV{'form.replydisc'}) { + $contrib{'replyto'}=(split(/\:\:\:/,$ENV{'form.replydisc'}))[1]; + } + if ($anon) { + $contrib{'anonymous'}='true'; + } + if (($symb) && ($email)) { + $status='Adding to class discussion'.($anon?' (anonymous)':'').': '. + &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.='
        '.&mt('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; + unless ($temp=~/^error\:/) { + my %newrecord=(); + $newrecord{'resource'}=$symb; + $newrecord{'subnumber'}=$record{'subnumber'}+1; + $status.='
        '.&mt('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); + my $subject=&clear_out_html($ENV{'form.subject'}); + $subject=~s/\n/\
        /g; + $subject=&Apache::lontexconvert::msgtexconverted($subject); + $r->print('
        '. + 'Subject: '.$subject.'

        '. + $message.'
        '); +} + +sub generate_preview_button { + my $pre=&mt("Show Preview"); + return(< + + + + +ENDPREVIEW +} + sub handler { my $r = shift; if ($r->header_only) { - $r->content_type('text/html'); + &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; return OK; } - + +# --------------------------- Get query string for limited number of parameters + + &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, + ['hide','unhide','deldisc','postdata','preview','replydisc','threadedon','threadedoff','onlyunread','allposts','previous','markread','markonread','markondisp']); + + if (($ENV{'form.markondisp'}) || ($ENV{'form.markonread'})) { +# ---------------------- Modify setting for identification of 'NEW' posts in this discussion + + &Apache::loncommon::content_type($r,'text/html'); + $r->send_http_header; + my $symb=$ENV{'form.markondisp'}?$ENV{'form.markondisp'}:$ENV{'form.markonread'}; + my $ressymb = $symb; + my ($map,$ind,$url)=&Apache::lonnet::decode_symb($symb); + unless ($ressymb =~ m|bulletin___\d+___adm/wrapper|) { + $ressymb=~s|(bulletin___\d+___)|$1adm/wrapper|; + } + + my %discinfo = (); + my $lastkey = $ressymb.'_lastread'; + my $ondispkey = $ressymb.'_markondisp'; + if ($ENV{'form.markondisp'}) { + $discinfo{$lastkey} = time; + $discinfo{$ondispkey} = 1; + } elsif ($ENV{'form.markonread'}) { + if ( defined($ENV{'previous'}) ) { + $discinfo{$lastkey} = $ENV{'previous'}; + } + $discinfo{$ondispkey} = 0; + } + &Apache::lonnet::put('nohist_'.$ENV{'request.course.id'}.'_discuss',\%discinfo,$ENV{'user.domain'},$ENV{'user.name'}); + if ($ENV{'form.markondisp'}) { + &redirect_back($r,&Apache::lonnet::clutter($url),&mt('Changed display status').'
        ','0','0'); + } else { + &redirect_back($r,&Apache::lonnet::clutter($url),&mt('Changed display status').'
        ','0','0','',$ENV{'form.previous'}); + } + return OK; + } elsif (($ENV{'form.allposts'}) || ($ENV{'form.onlyunread'})) { +# ----------------------------------------------------------------- Modify display setting for this discussion + &Apache::loncommon::content_type($r,'text/html'); + $r->send_http_header; + my $symb=$ENV{'form.allposts'}?$ENV{'form.allposts'}:$ENV{'form.onlyunread'}; + my $ressymb = $symb; + my ($map,$ind,$url)=&Apache::lonnet::decode_symb($symb); + unless ($ressymb =~ m|bulletin___\d+___adm/wrapper|) { + $ressymb=~s|(bulletin___\d+___)|$1adm/wrapper|; + } + my %discinfo = (); + if ($ENV{'form.allposts'}) { + $discinfo{$ressymb.'_showonlyunread'} = 0; + } elsif ($ENV{'form.onlyunread'}) { + $discinfo{$ressymb.'_showonlyunread'} = 1; + } + &Apache::lonnet::put('nohist_'.$ENV{'request.course.id'}.'_discuss',\%discinfo,$ENV{'user.domain'},$ENV{'user.name'}); + &redirect_back($r,&Apache::lonnet::clutter($url),&mt('Changed display status').'
        ','0','0','',$ENV{'form.previous'}); + return OK; + } elsif ($ENV{'form.markread'}) { +# ----------------------------------------------------------------- Mark new posts as read + &Apache::loncommon::content_type($r,'text/html'); + $r->send_http_header; + my $symb=$ENV{'form.markread'}; + my $ressymb = $symb; + my ($map,$ind,$url)=&Apache::lonnet::decode_symb($symb); + unless ($ressymb =~ m|bulletin___\d+___adm/wrapper|) { + $ressymb=~s|(bulletin___\d+___)|$1adm/wrapper|; + } + my %discinfo = (); + my $lastkey = $ressymb.'_lastread'; + $discinfo{$lastkey} = time; + &Apache::lonnet::put('nohist_'.$ENV{'request.course.id'}.'_discuss',\%discinfo,$ENV{'user.domain'},$ENV{'user.name'}); + &redirect_back($r,&Apache::lonnet::clutter($url),&mt('Changed reading status').'
        ','0','0'); + return OK; + } elsif (($ENV{'form.hide'}) || ($ENV{'form.unhide'})) { +# ----------------------------------------------------------------- Hide/unhide + &Apache::loncommon::content_type($r,'text/html'); + $r->send_http_header; + + my $entry=$ENV{'form.hide'}?$ENV{'form.hide'}:$ENV{'form.unhide'}; + + my ($symb,$idx)=split(/\:\:\:/,$entry); + my ($map,$ind,$url)=&Apache::lonnet::decode_symb($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 $currenthidden=$contrib{'hidden'}; + + if ($ENV{'form.hide'}) { + $currenthidden.='.'.$idx.'.'; + } else { + $currenthidden=~s/\.$idx\.//g; + } + my %newhash=('hidden' => $currenthidden); + + &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), + &mt('Changed discussion status').'
        ','0','0','',$ENV{'form.previous'}); + } elsif (($ENV{'form.threadedon'}) || ($ENV{'form.threadedoff'})) { + &Apache::loncommon::content_type($r,'text/html'); + $r->send_http_header; + if ($ENV{'form.threadedon'}) { + &Apache::lonnet::put('environment',{'threadeddiscussion' => 'on'}); + &Apache::lonnet::appenv('environment.threadeddiscussion' => 'on'); + } else { + &Apache::lonnet::del('environment',['threadeddiscussion']); + &Apache::lonnet::delenv('environment\.threadeddiscussion'); + } + my $symb=$ENV{'form.threadedon'}?$ENV{'form.threadedon'}:$ENV{'form.threadedoff'}; + my ($map,$ind,$url)=&Apache::lonnet::decode_symb($symb); + &redirect_back($r,&Apache::lonnet::clutter($url), + &mt('Changed discussion view mode').'
        ','0','0','',$ENV{'form.previous'}); + } elsif ($ENV{'form.deldisc'}) { +# --------------------------------------------------------------- Hide for good + &Apache::loncommon::content_type($r,'text/html'); + $r->send_http_header; + + my $entry=$ENV{'form.deldisc'}; + + my ($symb,$idx)=split(/\:\:\:/,$entry); + my ($map,$ind,$url)=&Apache::lonnet::decode_symb($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), + &mt('Changed discussion status').'
        ','0','0','',$ENV{'form.previous'}); + } elsif ($ENV{'form.preview'}) { +# -------------------------------------------------------- User wants a preview + $r->content_type('text/html'); + $r->send_http_header; + &show_preview($r); + } else { +# ------------------------------------------------------------- Normal feedback my $feedurl=$ENV{'form.postdata'}; $feedurl=~s/^http\:\/\///; $feedurl=~s/^$ENV{'SERVER_NAME'}//; $feedurl=~s/^$ENV{'HTTP_HOST'}//; + $feedurl=~s/\?.+$//; - my $symb=&Apache::lonnet::symbread($feedurl); + my $symb; + if ($ENV{'form.replydisc'}) { + $symb=(split(/\:\:\:/,$ENV{'form.replydisc'}))[0]; + my ($map,$id,$url)=&Apache::lonnet::decode_symb($symb); + $feedurl=&Apache::lonnet::clutter($url); + } else { + $symb=&Apache::lonnet::symbread($feedurl); + } + unless ($symb) { + $symb=$ENV{'form.symb'}; + if ($symb) { + my ($map,$id,$url)=&Apache::lonnet::decode_symb($symb); + $feedurl=&Apache::lonnet::clutter($url); + } + } my $goahead=1; if ($feedurl=~/\.(problem|exam|quiz|assess|survey|form)$/) { unless ($symb) { $goahead=0; } } - + # backward compatibility (bulltin boards used to be 'wrapped') + if ($feedurl=~m|^/adm/wrapper/adm/.*/bulletinboard$|) { + $feedurl=~s|^/adm/wrapper||; + } if ($goahead) { # Go ahead with feedback, no ambiguous reference - $r->content_type('text/html'); + &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; if ( @@ -288,6 +1103,8 @@ sub handler { ) || ($ENV{'request.course.id'} && ($feedurl!~m:^/adm:)) + || + ($ENV{'request.course.id'} && ($symb=~/^bulletin\_\_\_/)) ) { # --------------------------------------------------- Print login screen header unless ($ENV{'form.sendit'}) { @@ -301,27 +1118,57 @@ sub handler { # Get previous user input my $prevattempts=&Apache::loncommon::get_previous_attempt( - $symb,$ENV{'user.name'},$ENV{'user.domain'},$ENV{'user.home'}, + $symb,$ENV{'user.name'},$ENV{'user.domain'}, $ENV{'request.course.id'}); # 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',undef,'feedback'); + } + } # 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'}) { + my $subject = &clear_out_html($ENV{'form.subject'}); + $typestyle.=&adddiscuss($symb,$message,0,$attachmenturl,$subject); + $numpost++; + } + + if ($ENV{'form.anondiscuss'}) { + my $subject = &clear_out_html($ENV{'form.subject'}); + $typestyle.=&adddiscuss($symb,$message,1,$attachmenturl,$subject); + $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,$ENV{'form.previous'}); } } else { @@ -330,13 +1177,14 @@ sub handler { } } else { # Ambiguous Problem Resource - $r->internal_redirect('/adm/ambiguous'); + if ( &Apache::lonnet::mod_perl_version() == 2 ) { + &Apache::lonnet::cleanenv(); + } + $r->internal_redirect('/adm/ambiguous'); } +} return OK; } 1; __END__ - - -