--- loncom/interface/lonfeedback.pm 2003/11/24 16:46:15 1.71 +++ loncom/interface/lonfeedback.pm 2004/06/23 17:42:58 1.95 @@ -1,7 +1,7 @@ # The LearningOnline Network # Feedback # -# $Id: lonfeedback.pm,v 1.71 2003/11/24 16:46:15 www Exp $ +# $Id: lonfeedback.pm,v 1.95 2004/06/23 17:42:58 sakharuk 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; @@ -51,10 +34,40 @@ use Apache::Constants qw(:common); use Apache::lonmsg(); use Apache::loncommon(); use Apache::lontexconvert(); -use Apache::lonlocal; +use Apache::lonlocal; # must not have () +use Apache::lonhtmlcommon(); + +sub discussion_open { + my ($status)=@_; + if (defined($status) && + !($status eq 'CAN_ANSWER' || $status eq 'CANNOT_ANSWER' + || $status eq 'OPEN')) { + return 0; + } + my $close=&Apache::lonnet::EXT('resource.0.discussend'); + if (defined($close) && $close ne '' && $close < time) { + return 0; + } + return 1; +} + +sub discussion_visible { + my ($status)=@_; + if (not &discussion_open($status)) { + my $hidden=&Apache::lonnet::EXT('resource.0.discusshide'); + if (lc($hidden) eq 'yes' or $hidden eq '' or !defined($hidden)) { + return 0; + } + } + return 1; +} sub list_discussion { my ($mode,$status,$symb)=@_; + + my $outputtarget=$ENV{'form.grade_target'}; + if (not &discussion_visible($status)) { return ''; } + my @bgcols = ("#cccccc","#eeeeee"); my $discussiononly=0; if ($mode eq 'board') { $discussiononly=1; } unless ($ENV{'request.course.id'}) { return ''; } @@ -67,10 +80,73 @@ sub list_discussion { $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); + my $viewgrades=(&Apache::lonnet::allowed('vgr',$crs) + && ($symb=~/\.(problem|exam|quiz|assess|survey|form)$/)); my @discussionitems=(); - my %contrib=&Apache::lonnet::restore($symb,$ENV{'request.course.id'}, + 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; @@ -79,6 +155,8 @@ sub list_discussion { my @index=(); my @replies=(); my %alldiscussion=(); + my %notshown = (); + my %newitem = (); my $maxdepth=0; my $target=''; @@ -86,9 +164,23 @@ sub list_discussion { $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.'; @@ -113,13 +205,19 @@ 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+)$/); - $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) { @@ -147,25 +245,42 @@ 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 (&discussion_open($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', @@ -178,56 +293,199 @@ 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 { + 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.=''; - if ($visible>2) { +# Print the discusssion + if ($outputtarget ne 'tex') { + $discussion.='
'; my $colspan=$maxdepth+1; - $discussion.=''; + $discussion .= ''. + ''; + } else { + $discussion.='\vskip 0 mm\noindent\makebox[2 cm][b]{\hrulefill}'. + '\textbf{DISCUSSIONS}\makebox[2 cm][b]{\hrulefill}'. + '\vskip 0 mm\noindent\textbf{'.$lt{'cuse'}.'}:\vskip 0 mm'. + '\noindent\textbf{'.$lt{'disa'}.'}: \textit{'.$currdisp.'}\vskip 0 mm'. + '\noindent\textbf{'.$lt{'npce'}.'}: \textit{'.$currmark.'}'; } - + 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') { + if ($outputtarget ne 'tex') { + $discussion.="\n"; + } else { + $discussion.='\vskip 0 mm\noindent\makebox[2 cm][b]{\hrulefill}'; + } + my $thisdepth=$depth[$alldiscussion{$_}]; + if ($outputtarget ne 'tex') { + for (1..$thisdepth) { + $discussion.=''; + } + } + my $colspan=$maxdepth-$thisdepth+1; + if ($outputtarget ne 'tex') { + $discussion.=''; + } else { + #cleanup block + $discussionitems[$alldiscussion{$_}]=~s/]*)>/
'. - ''.&mt('Threaded View').'  '. - ''.&mt('Chronological View').''. - '
'. + ''. + ''. + ''. + ''. + '
'.$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{$_}]. + '
/; + $discussionitems[$alldiscussion{$_}]=~s/]*)>]*)>/"; + } + if ($outputtarget ne 'tex') { + $discussion.='
/; + my $threadinsert=''; + if ($thisdepth > 0) { + $threadinsert='
Reply: '.$thisdepth.''; + } + $discussionitems[$alldiscussion{$_}]=~s/<\/td>]*)>/$threadinsert<\/td>
/; + $discussionitems[$alldiscussion{$_}]=~s/]+)>(Hide|Delete|Reply|Submissions)<\/a>//g; + $discussionitems[$alldiscussion{$_}]=~s/(|<\/b>|<\/a>|]+)>)//g; + $discussion.=&Apache::lonxml::xmlparse('','tex',$discussionitems[$alldiscussion{$_}]); + } } - my $colspan=$maxdepth-$thisdepth+1; - $discussion.="".$discussionitems[$alldiscussion{$_}]. - "


'; } - $discussion.=''; } 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(); - } + if ($outputtarget ne 'tex') { + $discussion.=&generate_preview_button(); + } + } else { + if (&discussion_open($status) && + &Apache::lonnet::allowed('pch', + $ENV{'request.course.id'}. + ($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:''))) { + if ($outputtarget ne 'tex') { + $discussion.='
'. + ''. + &mt('Post Discussion').'
'; + } + } + } return $discussion; } @@ -238,23 +496,39 @@ 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(); + my $latexHelp=&Apache::loncommon::helpLatexCheatsheet(); + my $htmlheader=&Apache::lonhtmlcommon::htmlareaheaders(); + my $onsubmit=''; + if ((&Apache::lonhtmlcommon::htmlareabrowser()) && + (!&Apache::lonhtmlcommon::htmlareablocked())) { + $onsubmit='document.mailform.onsubmit();'; + } + my $send=&mt('Send'); $r->print(< The LearningOnline Network with CAPA +$htmlheader