--- loncom/interface/lonfeedback.pm 2003/07/01 19:27:31 1.48 +++ loncom/interface/lonfeedback.pm 2003/09/11 20:03:28 1.53 @@ -1,7 +1,7 @@ # The LearningOnline Network # Feedback # -# $Id: lonfeedback.pm,v 1.48 2003/07/01 19:27:31 albertel Exp $ +# $Id: lonfeedback.pm,v 1.53 2003/09/11 20:03:28 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -56,6 +56,8 @@ sub mail_screen { my ($r,$feedurl,$options) = @_; my $bodytag=&Apache::loncommon::bodytag('Resource Feedback and Discussion', '','onLoad="window.focus();"'); + my $title=&Apache::lonnet::gettitle($feedurl); + if (!$title) { $title = $feedurl; } my $latexHelp = Apache::loncommon::helpLatexCheatsheet(); $r->print(< @@ -105,7 +107,7 @@ sub mail_screen { $bodytag -

$feedurl

+

$title

@@ -151,11 +153,13 @@ sub redirect_back { - + $typestyle Sent $sendsomething message(s), and $sendposts post(s). $status + +
ENDREDIR @@ -175,7 +179,7 @@ ENDNOREDIR $r->print (< - + Sorry, no feedback possible on this resource ... @@ -185,22 +189,23 @@ ENDNOREDIRTWO sub screen_header { my ($feedurl) = @_; - my $options=''; + my $msgoptions=''; + my $discussoptions=''; if (($feedurl=~/^\/res\//) && ($feedurl!~/^\/res\/adm/)) { - $options= + $msgoptions= '

Feedback to resource author'; } if (&feedback_available(1)) { - $options.= + $msgoptions.= '
Question about resource content'; } if (&feedback_available(0,1)) { - $options.= + $msgoptions.= '
'. 'Question/Comment/Feedback about course content'; } if (&feedback_available(0,0,1)) { - $options.= + $msgoptions.= '
'. 'Question/Comment/Feedback about course policy'; } @@ -209,14 +214,17 @@ sub screen_header { if (&Apache::lonnet::allowed('pch', $ENV{'request.course.id'}. ($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:''))) { - $options.='
'. - 'Contribution to course discussion of resource'; - $options.='
'. - 'Anonymous contribution to course discussion of resource'. - ' (name only visible to course faculty)'; + $discussoptions=' '. + 'Contribution to course discussion of resource'; + $discussoptions.='
'. + 'Anonymous contribution to course discussion of resource'. + ' (name only visible to course faculty)'; } } - return $options; + if ($msgoptions) { $msgoptions='

Sending Messages

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

Discussion Contributions

'.$discussoptions; } + return $msgoptions.$discussoptions; } sub resource_output { @@ -457,7 +465,7 @@ sub handler { my $entry=$ENV{'form.hide'}?$ENV{'form.hide'}:$ENV{'form.unhide'}; my ($symb,$idx)=split(/\:\:\:/,$entry); - my ($map,$ind,$url)=split(/\_\_\_/,$symb); + 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'}, @@ -487,7 +495,7 @@ sub handler { my $entry=$ENV{'form.deldisc'}; my ($symb,$idx)=split(/\:\:\:/,$entry); - my ($map,$ind,$url)=split(/\_\_\_/,$symb); + 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'}, @@ -520,7 +528,7 @@ sub handler { unless ($symb) { $symb=$ENV{'form.symb'}; if ($symb) { - my ($map,$id,$url)=split(/\_\_\_/,$symb); + my ($map,$id,$url)=&Apache::lonnet::decode_symb($symb); $feedurl=&Apache::lonnet::clutter($url); } } @@ -561,10 +569,12 @@ sub handler { # Get output from resource my $usersaw=&resource_output($feedurl); -# Get resource answer +# Get resource answer (need to allow student to view grades for this to work) + &Apache::lonnet::appenv(('allowed.vgr'=>'F')); my $useranswer=&Apache::loncommon::get_student_answers( $symb,$ENV{'user.name'},$ENV{'user.domain'}, $ENV{'request.course.id'}); + &Apache::lonnet::delenv('allowed.vgr'); # Get attachments, if any, and not too large my $attachmenturl=''; if ($ENV{'form.attachment.filename'}) { @@ -610,7 +620,10 @@ sub handler { } } else { # Ambiguous Problem Resource - $r->internal_redirect('/adm/ambiguous'); + if ( Apache::exists_config_define("MODPERL2") ) { + &Apache::lonnet::cleanenv(); + } + $r->internal_redirect('/adm/ambiguous'); } } return OK;