--- loncom/interface/lonfeedback.pm 2004/01/28 16:10:26 1.75 +++ loncom/interface/lonfeedback.pm 2004/05/05 23:04:57 1.81 @@ -1,7 +1,7 @@ # The LearningOnline Network # Feedback # -# $Id: lonfeedback.pm,v 1.75 2004/01/28 16:10:26 albertel Exp $ +# $Id: lonfeedback.pm,v 1.81 2004/05/05 23:04:57 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -25,24 +25,7 @@ # # http://www.lon-capa.org/ # -# (Internal Server Error Handler -# -# (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) -# -# 3/1/1 Gerd Kortemeyer) -# -# 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 -# 7/26 Guy Albertelli -# 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; @@ -55,8 +38,9 @@ use Apache::lonlocal; sub list_discussion { my ($mode,$status,$symb)=@_; - &Apache::lonnet::logthis("status is $status"); - if (!($status eq 'CAN_ANSWER' || $status eq 'CANNOT_ANSWER')) { +# &Apache::lonnet::logthis("status is $status"); + if (!($status eq 'CAN_ANSWER' || $status eq 'CANNOT_ANSWER' + || $status eq 'OPEN')) { return ''; } my $discussiononly=0; @@ -71,14 +55,48 @@ sub list_discussion { $symb=&Apache::lonnet::symbread(); } unless ($symb) { return ''; } - my $seeid=&Apache::lonnet::allowed('rin',$crs); - my $viewgrades=&Apache::lonnet::allowed('vgr',$crs); - my @discussionitems=(); - # backward compatibility (bulletin boards used to be 'wrapped') + +# backward compatibility (bulletin boards used to be 'wrapped') my $ressymb=$symb; if ($mode eq 'board') { - $ressymb=~s|(bulletin___\d+___)|$1adm/wrapper|; + 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 %dischash = &Apache::lonnet::get('nohist_'.$ENV{'request.course.id'}.'_discuss',[$lastkey,$showkey,$visitkey],$ENV{'user.domain'},$ENV{'user.name'}); + my $showonlyunread = 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})) { + $prevread = $dischash{$lastkey}; + } + + 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'}); @@ -88,6 +106,7 @@ sub list_discussion { my @index=(); my @replies=(); my %alldiscussion=(); + my %notshown = (); my $maxdepth=0; my $target=''; @@ -95,9 +114,21 @@ sub list_discussion { $ENV{'environment.remote'} eq 'off' ) { $target='target="LONcom"'; } + + my $now = time; + my %discinfo = (); + $discinfo{$visitkey} = $visit; + $discinfo{$lastkey} = $now; + + &Apache::lonnet::put('nohist_'.$ENV{'request.course.id'}.'_discuss',\%discinfo,$ENV{'user.domain'},$ENV{'user.name'}); + if ($contrib{'version'}) { for (my $id=1;$id<=$contrib{'version'};$id++) { my $idx=$id; + my $posttime = $contrib{$idx.':timestamp'}; + if ($prevread > 0 && $prevread <= $posttime) { + $newpostsflag = 1; + } my $hidden=($contrib{'hidden'}=~/\.$idx\./); my $deleted=($contrib{'deleted'}=~/\.$idx\./); my $origindex='0.'; @@ -122,6 +153,11 @@ sub list_discussion { 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,$ft) =($contrib{$idx.':attachmenturl'}=~/\/(\w+)\.(\w+)$/); @@ -156,25 +192,41 @@ sub list_discussion { if ($seeid) { if ($hidden) { $sender.=' '.&mt('Make Visible').''; + $ressymb.':::'.$idx; + if ($newpostsflag) { + $sender .= '&previous='.$prevread; + } + $sender .= '">'.&mt('Make Visible').''; } else { $sender.=' '.&mt('Hide').''; + $ressymb.':::'.$idx; + if ($newpostsflag) { + $sender .= '&previous='.$prevread; + } + $sender .= '">'.&mt('Hide').''; } $sender.=' '.&mt('Delete').''; - } - if (&Apache::lonnet::allowed('pch', - $ENV{'request.course.id'}. - ($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:''))) { - $sender.=' '.&mt('Reply').''; + $ressymb.':::'.$idx; + if ($newpostsflag) { + $sender .= '&previous='.$prevread; + } + $sender .= '">'.&mt('Delete').''; } } else { if ($screenname) { $sender=''.$screenname.''; } } + if (&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', @@ -187,37 +239,77 @@ sub list_discussion { } $alldiscussion{$thisindex}=$idx; $index[$idx]=$thisindex; - $discussionitems[$idx]='

'.$sender.' '.$vgrlink.' ('. - localtime($contrib{$idx.':timestamp'}). - '):

'.$message. - '

'; - } - } + my $spansize = 2; + if ($showonlyunread && $prevread > $posttime) { + $notshown{$idx} = 1; + } else { + $discussionitems[$idx]='

'; + if ($prevread > 0 && $prevread <= $posttime) { + $discussionitems[$idx] .= ''; + } + $discussionitems[$idx] .= ''. + '
NEW  '. + ''.$subject.'  '. + $sender.' '.$vgrlink.' ('. + localtime($posttime).')

'.$message.'

'; + } + } + } } } + my $discussion=''; if ($visible) { -# Print a the discusssion +# Print the discusssion $discussion.=''; if ($visible>2) { my $colspan=$maxdepth+1; $discussion.=''; + '
'. - ''.&mt('Threaded View').'  '. - ''.&mt('Chronological View').''. - '
'. + '
'. + ''.&mt('Threaded View').'  '. + ''.&mt('Chronological View').'  '.&mt('Show all posts').'?'; + } else { + $discussion .= 'onlyunread='.$ressymb; + if ($newpostsflag) { + $discussion .= '&previous='.$prevread; + } + $discussion .= '">'.&mt('Show only unread posts').'?'; + } + $discussion .= '  
'; } - + my $numhidden = keys %notshown; + if ($numhidden > 0) { + my $colspan = $maxdepth+1; + $discussion.="\n".''. + ''.&mt('Show all posts').' '.&mt('to display').' '. + $numhidden.' '.&mt('previously viewed posts'). + '
'; + } foreach (sort { $a <=> $b } keys %alldiscussion) { - $discussion.="\n"; - my $thisdepth=$depth[$alldiscussion{$_}]; - for (1..$thisdepth) { - $discussion.='   '; + unless ($notshown{$alldiscussion{$_}} eq '1') { + $discussion.="\n"; + my $thisdepth=$depth[$alldiscussion{$_}]; + for (1..$thisdepth) { + $discussion.='   '; + } + my $colspan=$maxdepth-$thisdepth+1; + $discussion.=''. + $discussionitems[$alldiscussion{$_}]. + ''; } - my $colspan=$maxdepth-$thisdepth+1; - $discussion.="".$discussionitems[$alldiscussion{$_}]. - ""; - } - $discussion.=''; + } + $discussion.='

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

Attachment (128 KB max size): @@ -256,15 +349,23 @@ sub mail_screen { 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\./)) { + 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(); @@ -322,6 +423,7 @@ $bodytag

$title

+$prevtag Please check at least one of the following feedback types: @@ -330,6 +432,8 @@ $quote

My question/comment/feedback:

$latexHelp +Title:

+

@@ -362,14 +466,25 @@ ENDFAILREDIR } sub redirect_back { - my ($r,$feedurl,$typestyle,$sendsomething,$sendposts,$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 - + @@ -377,6 +492,7 @@ $typestyle Sent $sendsomething message(s), and $sendposts post(s). $status +$prevtag @@ -603,7 +719,7 @@ sub send_msg { } sub adddiscuss { - my ($symb,$email,$anon,$attachmenturl)=@_; + my ($symb,$email,$anon,$attachmenturl,$subject)=@_; my $status=''; if (&Apache::lonnet::allowed('pch',$ENV{'request.course.id'}. ($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:''))) { @@ -616,7 +732,8 @@ sub adddiscuss { $ENV{'environment.middlename'}.' '. $ENV{'environment.lastname'}.' '. $ENV{'enrironment.generation'}, - 'attachmenturl'=> $attachmenturl); + 'attachmenturl'=> $attachmenturl, + 'subject' => $subject); if ($ENV{'form.replydisc'}) { $contrib{'replyto'}=(split(/\:\:\:/,$ENV{'form.replydisc'}))[1]; } @@ -656,7 +773,11 @@ sub show_preview { 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.'
'); } @@ -664,9 +785,10 @@ sub generate_preview_button { my $pre=&mt("Show Preview"); return(< + +onClick="this.form.comment.value=document.mailform.comment.value;this.form.subject.value=document.mailform.subject.value;this.form.submit();" /> ENDPREVIEW } @@ -682,9 +804,30 @@ sub handler { # --------------------------- Get query string for limited number of parameters &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, - ['hide','unhide','deldisc','postdata','preview','replydisc','threadedon','threadedoff']); + ['hide','unhide','deldisc','postdata','preview','replydisc','threadedon','threadedoff','onlyunread','allposts','previous']); - if (($ENV{'form.hide'}) || ($ENV{'form.unhide'})) { + if (($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 ($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 %readinghash = (); + + if ($contrib{'version'}) { + if ($ENV{'form.allposts'}) { + $readinghash{$symb.'_showonlyunread'} = 0; + } elsif ($ENV{'form.onlyunread'}) { + $readinghash{$symb.'_showonlyunread'} = 1; + } + &Apache::lonnet::put('nohist_'.$ENV{'request.course.id'}.'_discuss',\%readinghash,$ENV{'user.domain'},$ENV{'user.name'}); + } + &redirect_back($r,&Apache::lonnet::clutter($url),&mt('Changed reading status').'
','0','0','',$ENV{'form.previous'}); + return OK; + } elsif (($ENV{'form.hide'}) || ($ENV{'form.unhide'})) { # ----------------------------------------------------------------- Hide/unhide &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; @@ -713,7 +856,7 @@ sub handler { $ENV{'course.'.$ENV{'request.course.id'}.'.num'}); &redirect_back($r,&Apache::lonnet::clutter($url), - &mt('Changed discussion status').'
','0','0'); + &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; @@ -727,7 +870,7 @@ sub handler { 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'); + &mt('Changed discussion view mode').'
','0','0','',$ENV{'form.previous'}); } elsif ($ENV{'form.deldisc'}) { # --------------------------------------------------------------- Hide for good &Apache::loncommon::content_type($r,'text/html'); @@ -754,9 +897,11 @@ sub handler { $ENV{'course.'.$ENV{'request.course.id'}.'.num'}); &redirect_back($r,&Apache::lonnet::clutter($url), - &mt('Changed discussion status').'
','0','0'); + &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 @@ -852,18 +997,20 @@ sub handler { my $numpost=0; if ($ENV{'form.discuss'}) { - $typestyle.=&adddiscuss($symb,$message,0,$attachmenturl); + my $subject = &clear_out_html($ENV{'form.subject'}); + $typestyle.=&adddiscuss($symb,$message,0,$attachmenturl,$subject); $numpost++; } if ($ENV{'form.anondiscuss'}) { - $typestyle.=&adddiscuss($symb,$message,1,$attachmenturl); + 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,$numpost,$status); + &redirect_back($r,$feedurl,$typestyle,$numsent,$numpost,$status,$ENV{'form.previous'}); } } else {