--- loncom/interface/lonfeedback.pm 2004/01/28 16:10:26 1.75 +++ loncom/interface/lonfeedback.pm 2004/04/28 21:13:13 1.78 @@ -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.78 2004/04/28 21:13:13 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,8 +55,23 @@ sub list_discussion { $symb=&Apache::lonnet::symbread(); } unless ($symb) { return ''; } + + my %dischash = &Apache::lonnet::restore($symb,$ENV{'request.course.id'}.'_discuss',$ENV{'user.domain'},$ENV{'user.name'}); + my %readids = (); + my $showonlyunread; + foreach my $key (keys %dischash) { + if ($key eq 'showonlyunread') { + $showonlyunread = $dischash{$key}; + } else { + if ($dischash{$key} eq 'read') { + $readids{$key} = 1; + } + } + } + my $seeid=&Apache::lonnet::allowed('rin',$crs); - my $viewgrades=&Apache::lonnet::allowed('vgr',$crs); + my $viewgrades=(&Apache::lonnet::allowed('vgr',$crs) + && ($symb=~/\.(problem|exam|quiz|assess|survey|form)$/)); my @discussionitems=(); # backward compatibility (bulletin boards used to be 'wrapped') my $ressymb=$symb; @@ -122,6 +121,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,26 +160,36 @@ sub list_discussion { if ($seeid) { if ($hidden) { $sender.=' '.&mt('Make Visible').''; + $ressymb.':::'.$idx.'">'.&mt('Make Visible').''; } else { $sender.=' '.&mt('Hide').''; + $ressymb.':::'.$idx.'">'.&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.'">'.&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; + my $ctlink; + if ($readids{$idx} == 1) { + $ctlink = ''.&mt('Mark unread').'? '. + ''; + } else { + $ctlink = ''.&mt('Mark read').'? '. + ''; + } if ($viewgrades) { $vgrlink=&Apache::loncommon::submlink('Submissions', $contrib{$idx.':sendername'},$contrib{$idx.':senderdomain'},$symb); @@ -187,24 +201,43 @@ sub list_discussion { } $alldiscussion{$thisindex}=$idx; $index[$idx]=$thisindex; - $discussionitems[$idx]='

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

'.$message. - '

'; - } - } + $discussionitems[$idx]='

'. + ''; + if ($showonlyunread && $readids{$idx}) { + $discussionitems[$idx] .= '
'.$subject.'  '. + $sender.' '.$vgrlink.' ('. + localtime($contrib{$idx.':timestamp'}). + ')  '.$ctlink.'
Check "Show all posts?" or "Mark unread?", then "Save read settings" to display message
'; + } else { + $discussionitems[$idx] .= '

'.$message.'

'; + } + } + } } } my $discussion=''; if ($visible) { # Print a the discusssion + $discussion .= '
'; $discussion.=''; if ($visible>2) { my $colspan=$maxdepth+1; +my $showoption = ''; + } else { + $showoption .= 'Show only unread posts?'; + } + $discussion.=$showoption; $discussion.=''; + '
'; + my $showflag = 'all'; + if ($showonlyunread) { + $showoption .= 'Show all posts?
'. - ''.&mt('Threaded View').'  '. - ''.&mt('Chronological View').''. - '
'. + '
'. + ''.&mt('Threaded View').'  '. + ''.&mt('Chronological View').'  '.&mt('Mark all read').'  '. + ''.&mt('Mark all unread').'  '. + '
'; } foreach (sort { $a <=> $b } keys %alldiscussion) { @@ -214,10 +247,16 @@ sub list_discussion { $discussion.='   '; } my $colspan=$maxdepth-$thisdepth+1; - $discussion.="".$discussionitems[$alldiscussion{$_}]. - ""; + $discussion.=''. + $discussionitems[$alldiscussion{$_}]. + ''; } - $discussion.=''; + my $colspan=$maxdepth+1; + $discussion.='
'. ''. + ''; + $discussion .= '

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

Attachment (128 KB max size): @@ -256,6 +296,7 @@ sub mail_screen { my $title=&Apache::lonnet::gettitle($feedurl); if (!$title) { $title = $feedurl; } my $quote=''; + my $subject = ''; if ($ENV{'form.replydisc'}) { my ($symb,$idx)=split(/\:\:\:/,$ENV{'form.replydisc'}); my %contrib=&Apache::lonnet::restore($symb,$ENV{'request.course.id'}, @@ -265,6 +306,7 @@ sub mail_screen { my $message=$contrib{$idx.':message'}; $message=~s/\n/\
/g; $quote='

'.&Apache::lontexconvert::msgtexconverted($message).'
'; + $subject = 'Re: '.$contrib{$idx.':subject'}; } } my $latexHelp = Apache::loncommon::helpLatexCheatsheet(); @@ -330,6 +372,8 @@ $quote

My question/comment/feedback:

$latexHelp +Title:

+

@@ -603,7 +647,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 +660,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 +701,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 +713,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 +732,76 @@ 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']); + ['hide','unhide','deldisc','postdata','preview','replydisc','threadedon','threadedoff','markread','markunread','storereads','onlyunread','allposts','chgreads']); + + if (($ENV{'form.markread'}) || ($ENV{'form.markunread'})) { +# ----------------------------------------------------------------- Modify read/unread for all + &Apache::loncommon::content_type($r,'text/html'); + $r->send_http_header; + my $symb=$ENV{'form.markread'}?$ENV{'form.markread'}:$ENV{'form.markunread'}; + my $ressymb = $symb; + my ($map,$ind,$url)=&Apache::lonnet::decode_symb($symb); + $ressymb=~s|(bulletin___\d+___)|$1adm/wrapper|; + 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 %readinghash = (); + + if ($contrib{'version'}) { + for (my $id=1;$id<=$contrib{'version'};$id++) { + my $msgid = $id.':message'; + if (defined($contrib{$msgid})) { + if ($ENV{'form.markread'}) { + $readinghash{$id} = 'read'; + } else { + $readinghash{$id} = 'unread'; + } + } + } + if ($ENV{'form.allposts'}) { + $readinghash{'showonlyunread'} = 0; + } elsif ($ENV{'form.onlyunread'}) { + $readinghash{'showonlyunread'} = 1; + } + &Apache::lonnet::cstore(\%readinghash,$symb,$ENV{'request.course.id'}.'_discuss',$ENV{'user.domain'},$ENV{'user.name'}); + } + + &redirect_back($r,&Apache::lonnet::clutter($url),&mt('Changed reading status'),'0','0'); + return OK; + } else { + my $symb = $ENV{'form.discsymb'}; + my %readinghash = (); + my $chgcount = 0; + foreach my $key (keys %ENV) { + if ($key =~ m/^form\.postunread_(\d+)/) { + $readinghash{$1} = 'unread'; + $chgcount ++; + } elsif ($key =~ m/^form\.postread_(\d+)/) { + $readinghash{$1} = 'read'; + $chgcount ++; + } + } + if ($ENV{'form.allposts'}) { + $readinghash{'showonlyunread'} = 0; + $chgcount ++; + } elsif ($ENV{'form.onlyunread'}) { + $readinghash{'showonlyunread'} = 1; + $chgcount ++; + } + + if ($chgcount > 0) { + &Apache::lonnet::cstore(\%readinghash,$symb,$ENV{'request.course.id'}.'_discuss',$ENV{'user.domain'},$ENV{'user.name'}); + } + } - if (($ENV{'form.hide'}) || ($ENV{'form.unhide'})) { + if ($ENV{'form.chgreads'}) { + &Apache::loncommon::content_type($r,'text/html'); + $r->send_http_header; + my ($map,$ind,$url)=&Apache::lonnet::decode_symb($ENV{'form.chgreads'}); + &redirect_back($r,&Apache::lonnet::clutter($url), + &mt('Changed read status').'
','0','0'); + } elsif (($ENV{'form.hide'}) || ($ENV{'form.unhide'})) { # ----------------------------------------------------------------- Hide/unhide &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; @@ -713,7 +830,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 read status').'
','0','0'); } elsif (($ENV{'form.threadedon'}) || ($ENV{'form.threadedoff'})) { &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; @@ -757,6 +874,8 @@ sub handler { &mt('Changed discussion status').'
','0','0'); } elsif ($ENV{'form.preview'}) { # -------------------------------------------------------- User wants a preview + $r->content_type('text/html'); + $r->send_http_header; &show_preview($r); } else { # ------------------------------------------------------------- Normal feedback @@ -852,12 +971,14 @@ 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++; }