--- loncom/interface/lonfeedback.pm 2004/04/28 23:59:53 1.79 +++ loncom/interface/lonfeedback.pm 2004/05/25 22:16:05 1.84 @@ -1,7 +1,7 @@ # The LearningOnline Network # Feedback # -# $Id: lonfeedback.pm,v 1.79 2004/04/28 23:59:53 raeburn Exp $ +# $Id: lonfeedback.pm,v 1.84 2004/05/25 22:16:05 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -43,6 +43,8 @@ sub list_discussion { || $status eq 'OPEN')) { return ''; } + + my @bgcols = ("#cccccc","#eeeeee"); my $discussiononly=0; if ($mode eq 'board') { $discussiononly=1; } unless ($ENV{'request.course.id'}) { return ''; } @@ -56,33 +58,71 @@ sub list_discussion { } unless ($symb) { return ''; } - my %dischash = &Apache::lonnet::restore($symb,'nohist_'.$ENV{'request.course.id'}.'_discuss',$ENV{'user.domain'},$ENV{'user.name'}); - my %readids = (); - my $showonlyunread; - my $prevread = 0; - - foreach my $key (keys %dischash) { - if ($key eq 'lastread') { - $prevread = $dischash{$key}; +# 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|; } - if ($key eq 'showonlyunread') { - $showonlyunread = $dischash{$key}; - } else { - if ($dischash{$key} eq 'read') { - $readids{$key} = 1; - } + } + +# 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=(); - # backward compatibility (bulletin boards used to be 'wrapped') - my $ressymb=$symb; - if ($mode eq 'board') { - $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'}); @@ -92,6 +132,8 @@ sub list_discussion { my @index=(); my @replies=(); my %alldiscussion=(); + my %notshown = (); + my %newitem = (); my $maxdepth=0; my $target=''; @@ -101,14 +143,21 @@ sub list_discussion { } my $now = time; - my %discinfo = ( - 'lastread' => $now, - ); - &Apache::lonnet::cstore(\%discinfo,$symb,'nohist_'.$ENV{'request.course.id'}.'_discuss',$ENV{'user.domain'},$ENV{'user.name'}); + $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.'; @@ -139,12 +188,13 @@ sub list_discussion { $subject=&Apache::lontexconvert::msgtexconverted($subject); } if ($contrib{$idx.':attachmenturl'}) { - my ($fname,$ft) - =($contrib{$idx.':attachmenturl'}=~/\/(\w+)\.(\w+)$/); - $message.='

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

'; + my ($fname) + =($contrib{$idx.':attachmenturl'}=~m|/([^/]+)$|); + &Apache::lonnet::allowuploaded('/adm/feedback', + $contrib{$idx.':attachmenturl'}); + $message.='

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

'; } if ($message) { if ($hidden) { @@ -172,13 +222,25 @@ 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').''; + $ressymb.':::'.$idx; + if ($newpostsflag) { + $sender .= '&previous='.$prevread; + } + $sender .= '">'.&mt('Delete').''; } } else { if ($screenname) { @@ -189,19 +251,13 @@ sub list_discussion { $ENV{'request.course.id'}. ($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:''))) { $sender.=' '.&mt('Reply').''; + $ressymb.':::'.$idx; + if ($newpostsflag) { + $sender .= '&previous='.$prevread; + } + $sender .= '" '.$target.'>'.&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); @@ -213,70 +269,136 @@ sub list_discussion { } $alldiscussion{$thisindex}=$idx; $index[$idx]=$thisindex; - my $posttime = $contrib{$idx.':timestamp'}; my $spansize = 2; - $discussionitems[$idx]='

'; - if ($prevread > 0 && $prevread < $posttime) { - $discussionitems[$idx] .= ''; - $spansize ++; - } - $discussionitems[$idx] .= ''; - if ($showonlyunread && $readids{$idx}) { - $discussionitems[$idx] .= '
NEW  '. - ''.$subject.'  '. - $sender.' '.$vgrlink.' ('. - localtime($posttime).')'. - '  '. - $ctlink.'
Check "Show all posts?" or "Mark unread?", then "Save read settings" to display message
'; + if ($showonlyunread && $prevread > $posttime) { + $notshown{$idx} = 1; } else { - $discussionitems[$idx] .= '

'.$message.'

'; + 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 a the discusssion - $discussion .= '
'; +# Print the discusssion $discussion.=''; - if ($visible>2) { - my $colspan=$maxdepth+1; -my $showoption = ''; + my $colspan=$maxdepth+1; + $discussion .= ''. + ''; + my $numhidden = keys %notshown; + if ($numhidden > 0) { + my $colspan = $maxdepth+1; + $discussion.="\n".''; + } 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.=''; } - my $colspan=$maxdepth-$thisdepth+1; - $discussion.=''; - } - my $colspan=$maxdepth+1; - $discussion.=''; - $discussion .= '
'; - my $showflag = 'all'; - if ($showonlyunread) { - $showoption .= 'Show all posts?
'. + ''. + ''. + ''. + ''. + '
'.$lt{'cuse'}.'    '.$lt{'chgt'}.'
'.$lt{'disa'}.': '.$currdisp.'    '.$dispchange.'
'.$lt{'npce'}.': '.$currmark.'    '.$markchange.'
'. + ''; + if ($visible>2) { + $discussion.=''; + } + if ($newpostsflag) { + if (!$markondisp) { + $discussion .=''; + $discussion .= ''; } - $discussion.=$showoption; - $discussion.=''; - } + } else { + $discussion .= ''; + } + $discussion .= '
'. + ''.&mt('Threaded View').'  '. + ''.&mt('Chronological View').'  '.&mt('Mark new posts as read').'  '; } else { - $showoption .= 'Show only unread posts?
 
'. - ''. - '
'. - ''.&mt('Threaded View').'  '. - ''.&mt('Chronological View').'  '.&mt('Mark all read').'  '. - ''.&mt('Mark all unread').'  '. - '
 
'. + ''.&mt('Show all posts').' '.&mt('to display').' '. + $numhidden.' '.&mt('previously viewed posts'). + '
   
   '. + $discussionitems[$alldiscussion{$_}]. + '
'. - $discussionitems[$alldiscussion{$_}]. - '

'. ''. - '


'; + } + $discussion.='

'; } if ($discussiononly) { $discussion.=(</g; $quote='
'.&Apache::lontexconvert::msgtexconverted($message).'
'; @@ -330,6 +453,9 @@ sub mail_screen { $subject = 'Re: '.$contrib{$idx.':subject'}; } } + if ($ENV{'form.previous'}) { + $prevtag = ''; + } } my $latexHelp = Apache::loncommon::helpLatexCheatsheet(); my $send=&mt('Send'); @@ -386,6 +512,7 @@ $bodytag

$title

+$prevtag Please check at least one of the following feedback types: @@ -428,14 +555,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 - + @@ -443,6 +581,7 @@ $typestyle Sent $sendsomething message(s), and $sendposts post(s). $status +$prevtag @@ -754,75 +893,74 @@ 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','markread','markunread','storereads','onlyunread','allposts','chgreads']); + ['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 - 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 $symb=$ENV{'form.markondisp'}?$ENV{'form.markondisp'}:$ENV{'form.markonread'}; 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; + 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'}; } - &Apache::lonnet::cstore(\%readinghash,$symb,'nohist_'.$ENV{'request.course.id'}.'_discuss',$ENV{'user.domain'},$ENV{'user.name'}); + $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'}); } - - &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 ++; - } + } 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'}) { - $readinghash{'showonlyunread'} = 0; - $chgcount ++; + $discinfo{$ressymb.'_showonlyunread'} = 0; } elsif ($ENV{'form.onlyunread'}) { - $readinghash{'showonlyunread'} = 1; - $chgcount ++; + $discinfo{$ressymb.'_showonlyunread'} = 1; } - - if ($chgcount > 0) { - &Apache::lonnet::cstore(\%readinghash,$symb,'nohist_'.$ENV{'request.course.id'}.'_discuss',$ENV{'user.domain'},$ENV{'user.name'}); - } - } - - if ($ENV{'form.chgreads'}) { + &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 ($map,$ind,$url)=&Apache::lonnet::decode_symb($ENV{'form.chgreads'}); - &redirect_back($r,&Apache::lonnet::clutter($url), - &mt('Changed read status').'
','0','0'); + 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'); @@ -852,7 +990,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; @@ -866,7 +1004,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'); @@ -893,7 +1031,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.preview'}) { # -------------------------------------------------------- User wants a preview $r->content_type('text/html'); @@ -972,7 +1110,7 @@ sub handler { my $attachmenturl=''; if ($ENV{'form.attachment.filename'}) { unless (length($ENV{'form.attachment'})>131072) { - $attachmenturl=&Apache::lonnet::userfileupload('attachment'); + $attachmenturl=&Apache::lonnet::userfileupload('attachment',undef,'feedback'); } } # Filter HTML out of message (could be nasty) @@ -1006,7 +1144,7 @@ sub handler { # 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 {