--- loncom/interface/lonfeedback.pm 2003/09/15 13:38:19 1.55 +++ loncom/interface/lonfeedback.pm 2003/11/27 09:43:42 1.73 @@ -1,7 +1,7 @@ # The LearningOnline Network # Feedback # -# $Id: lonfeedback.pm,v 1.55 2003/09/15 13:38:19 www Exp $ +# $Id: lonfeedback.pm,v 1.73 2003/11/27 09:43:42 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -51,9 +51,12 @@ use Apache::Constants qw(:common); use Apache::lonmsg(); use Apache::loncommon(); use Apache::lontexconvert(); +use Apache::lonlocal; sub list_discussion { - my ($discussiononly,$symb)=@_; + my ($mode,$status,$symb)=@_; + 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'}) { @@ -66,30 +69,62 @@ sub list_discussion { unless ($symb) { return ''; } my $seeid=&Apache::lonnet::allowed('rin',$crs); my $viewgrades=&Apache::lonnet::allowed('vgr',$crs); - my $discussion=''; - my %contrib=&Apache::lonnet::restore($symb,$ENV{'request.course.id'}, + my @discussionitems=(); + # backward compatability (bulltein 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'}); + my $visible=0; + my @depth=(); + my @original=(); + my @index=(); + my @replies=(); + my %alldiscussion=(); + my $maxdepth=0; + + my $target=''; + unless ($ENV{'browser.interface'} eq 'textual' || + $ENV{'environment.remote'} eq 'off' ) { + $target='target="LONcom"'; + } if ($contrib{'version'}) { - unless ($discussiononly) { - $discussion.= - '
'; - } - my $idx; - for ($idx=1;$idx<=$contrib{'version'};$idx++) { + for (my $id=1;$id<=$contrib{'version'};$id++) { + my $idx=$id; 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); if ($contrib{$idx.':attachmenturl'}) { my ($fname,$ft) =($contrib{$idx.':attachmenturl'}=~/\/(\w+)\.(\w+)$/); - $message.='

Attachment: '.$fname.'.'.$ft.''; + '">'.$fname.'.'.$ft.'

'; } if ($message) { if ($hidden) { @@ -102,7 +137,7 @@ sub list_discussion { $contrib{$idx.':sendername'}, $contrib{$idx.':senderdomain'}); - my $sender='Anonymous'; + my $sender=&mt('Anonymous'); if ((!$contrib{$idx.':anonymous'}) || ($seeid)) { $sender=&Apache::loncommon::aboutmewrapper( $plainname, @@ -111,19 +146,25 @@ sub list_discussion { $contrib{$idx.':sendername'}.' at '. $contrib{$idx.':senderdomain'}.')'; if ($contrib{$idx.':anonymous'}) { - $sender.=' [anonymous] '. + $sender.=' ['.&mt('anonymous').'] '. $screenname; } if ($seeid) { if ($hidden) { $sender.=' Make Visible'; + $symb.':::'.$idx.'">'.&mt('Make Visible').''; } else { $sender.=' Hide'; + $symb.':::'.$idx.'">'.&mt('Hide').''; } $sender.=' Delete'; + $symb.':::'.$idx.'">'.&mt('Delete').''; + } + if (&Apache::lonnet::allowed('pch', + $ENV{'request.course.id'}. + ($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:''))) { + $sender.=' '.&mt('Reply').''; } } else { if ($screenname) { @@ -135,28 +176,56 @@ sub list_discussion { $vgrlink=&Apache::loncommon::submlink('Submissions', $contrib{$idx.':sendername'},$contrib{$idx.':senderdomain'},$symb); } - $discussion.='

'.$sender.' '.$vgrlink.' ('. +#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; + $discussionitems[$idx]='

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

'.$message. '

'; } } } - unless ($discussiononly) { - $discussion.='
'; + } + my $discussion=''; + if ($visible) { +# Print a the discusssion + $discussion.=''; + if ($visible>2) { + my $colspan=$maxdepth+1; + $discussion.=''; + } + + foreach (sort { $a <=> $b } keys %alldiscussion) { + $discussion.="\n"; + my $thisdepth=$depth[$alldiscussion{$_}]; + for (1..$thisdepth) { + $discussion.=''; + } + my $colspan=$maxdepth-$thisdepth+1; + $discussion.=""; } + $discussion.='
'. + ''.&mt('Threaded View').'  '. + ''.&mt('Chronological View').''. + '
   ".$discussionitems[$alldiscussion{$_}]. + "
'; } if ($discussiononly) { $discussion.=(< - +
Note: in anonymous discussion, your name is visible only to course faculty
- +

Attachment (128 KB max size):

@@ -173,13 +242,26 @@ sub mail_screen { '','onLoad="window.focus();"'); my $title=&Apache::lonnet::gettitle($feedurl); if (!$title) { $title = $feedurl; } + my $quote=''; + 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).'
'; + } + } my $latexHelp = Apache::loncommon::helpLatexCheatsheet(); $r->print(< The LearningOnline Network with CAPA - $bodytag

$title

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

+$options

+$quote +

My question/comment/feedback:

+

$latexHelp -

+

+

Attachment (128 KB max size):

- +

ENDDOCUMENT @@ -245,14 +332,15 @@ $r->print(&generate_preview_button().'print (< Feedback not sent - - + + - - + Sorry, no recipients ... @@ -261,18 +349,19 @@ ENDFAILREDIR sub redirect_back { my ($r,$feedurl,$typestyle,$sendsomething,$sendposts,$status) = @_; + if ($feedurl=~/^\/adm\//) { $feedurl.='?register=1' }; $r->print (< Feedback sent - + - - + $typestyle Sent $sendsomething message(s), and $sendposts post(s). -$status +$status
@@ -283,8 +372,9 @@ ENDREDIR sub no_redirect_back { my ($r,$feedurl) = @_; $r->print (< Feedback not sent - + ENDNOREDIR if ($feedurl!~/^\/adm\/feedback/) { @@ -293,9 +383,8 @@ ENDNOREDIR $r->print (< - - + Sorry, no feedback possible on this resource ... @@ -303,43 +392,46 @@ ENDNOREDIRTWO } sub screen_header { - my ($feedurl) = @_; - my $msgoptions=''; - my $discussoptions=''; - if (($feedurl=~/^\/res\//) && ($feedurl!~/^\/res\/adm/)) { - $msgoptions= - '

Feedback to resource author'; - } - if (&feedback_available(1)) { - $msgoptions.= - '
Question about resource content'; - } - if (&feedback_available(0,1)) { - $msgoptions.= - '
'. - 'Question/Comment/Feedback about course content'; - } - if (&feedback_available(0,0,1)) { - $msgoptions.= - '
'. - 'Question/Comment/Feedback about course policy'; - } - - if ($ENV{'request.course.id'}) { - if (&Apache::lonnet::allowed('pch', - $ENV{'request.course.id'}. - ($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:''))) { - $discussoptions=' '. - 'Contribution to course discussion of resource'; - $discussoptions.='
'. - 'Anonymous contribution to course discussion of resource'. - ' (name only visible to course faculty)'; + 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 (&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='

Sending Messages

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

Discussion Contributions

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

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

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

'.&mt('Discussion Contributions').'

'.$discussoptions; } + return $msgoptions.$discussoptions; } sub resource_output { @@ -363,14 +455,14 @@ sub clear_out_html { # 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); + BR=>1, TT=>1, STRONG=>1, BLOCKQUOTE=>1, DIV=>1, IMG=>1, + M=>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/\<\/*m\s*\>//g; $message=~s/\/\>\;/g; } @@ -387,7 +479,7 @@ ENDEMAIL my $citations=<<"ENDCITE";

        Previous attempts of student (if applicable)

        $prevattempts -

        +

        Original screen output (if applicable)

        $usersaw

        Correct Answer(s) (if applicable)

        @@ -434,7 +526,7 @@ sub decide_receiver { } } if ($ENV{'form.course'}||$course) { - $typestyle.='Submitting as Comment
        '; + $typestyle.='Submitting as Comment
        '; foreach (split(/\,/, $ENV{'course.'.$ENV{'request.course.id'}.'.comment.email'}) ) { @@ -443,7 +535,7 @@ sub decide_receiver { } } if ($ENV{'form.policy'}||$policy) { - $typestyle.='Submitting as Policy Feedback
        '; + $typestyle.='Submitting as Policy Feedback
        '; foreach (split(/\,/, $ENV{'course.'.$ENV{'request.course.id'}.'.policy.email'}) ) { @@ -474,7 +566,7 @@ sub send_msg { unless (&Apache::lonmsg::user_normal_msg(split(/\:/,$_), 'Feedback ['.$declutter.']',$email,$citations,$feedurl, $attachmenturl)=~/ok/) { - $status.='
        Error sending message to '.$_.'
        '; + $status.='
        '.&mt('Error sending message to').' '.$_.'
        '; } else { $sendsomething++; } @@ -488,7 +580,7 @@ sub send_msg { $newrecord{'resource'}=$feedurl; $newrecord{'subnumber'}=$record{'subnumber'}+1; unless (&Apache::lonnet::cstore(\%newrecord,'_feedback') eq 'ok') { - $status.='
        Not registered
        '; + $status.='
        '.&mt('Not registered').'
        '; } } @@ -510,6 +602,9 @@ sub adddiscuss { $ENV{'environment.lastname'}.' '. $ENV{'enrironment.generation'}, 'attachmenturl'=> $attachmenturl); + if ($ENV{'form.replydisc'}) { + $contrib{'replyto'}=(split(/\:\:\:/,$ENV{'form.replydisc'}))[1]; + } if ($anon) { $contrib{'anonymous'}='true'; } @@ -519,7 +614,7 @@ sub adddiscuss { $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}, $ENV{'course.'.$ENV{'request.course.id'}.'.num'}); my %storenewentry=($symb => time); - $status.='
        Updating discussion 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'}); @@ -530,13 +625,13 @@ sub adddiscuss { my %newrecord=(); $newrecord{'resource'}=$symb; $newrecord{'subnumber'}=$record{'subnumber'}+1; - $status.='
        Registering: '. + $status.='
        '.&mt('Registering').': '. &Apache::lonnet::cstore(\%newrecord,'_discussion'); } } else { $status.='Failed.'; } - return $status.'
        '; + return $status.'
        '; } # ----------------------------------------------------------- Preview function @@ -551,18 +646,20 @@ sub show_preview { } 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; } @@ -570,11 +667,11 @@ sub handler { # --------------------------- Get query string for limited number of parameters &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, - ['hide','unhide','deldisc','postdata','preview']); + ['hide','unhide','deldisc','postdata','preview','replydisc','threadedon','threadedoff']); if (($ENV{'form.hide'}) || ($ENV{'form.unhide'})) { # ----------------------------------------------------------------- Hide/unhide - $r->content_type('text/html'); + &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; my $entry=$ENV{'form.hide'}?$ENV{'form.hide'}:$ENV{'form.unhide'}; @@ -601,10 +698,24 @@ sub handler { $ENV{'course.'.$ENV{'request.course.id'}.'.num'}); &redirect_back($r,&Apache::lonnet::clutter($url), - 'Changed discussion status

        ','0','0'); + &mt('Changed discussion status').'
        ','0','0'); + } 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'); } elsif ($ENV{'form.deldisc'}) { # --------------------------------------------------------------- Hide for good - $r->content_type('text/html'); + &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; my $entry=$ENV{'form.deldisc'}; @@ -628,7 +739,7 @@ sub handler { $ENV{'course.'.$ENV{'request.course.id'}.'.num'}); &redirect_back($r,&Apache::lonnet::clutter($url), - 'Changed discussion status

        ','0','0'); + &mt('Changed discussion status').'
        ','0','0'); } elsif ($ENV{'form.preview'}) { # -------------------------------------------------------- User wants a preview &show_preview($r); @@ -638,8 +749,16 @@ sub handler { $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) { @@ -651,10 +770,13 @@ sub handler { if ($feedurl=~/\.(problem|exam|quiz|assess|survey|form)$/) { unless ($symb) { $goahead=0; } } - + # backward compatability (bulltein 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 ( @@ -735,7 +857,7 @@ sub handler { } } else { # Ambiguous Problem Resource - if ( Apache::exists_config_define("MODPERL2") ) { + if ( &Apache::lonnet::mod_perl_version() == 2 ) { &Apache::lonnet::cleanenv(); } $r->internal_redirect('/adm/ambiguous');