--- loncom/interface/lonfeedback.pm 2001/02/09 21:53:08 1.7 +++ loncom/interface/lonfeedback.pm 2002/10/11 20:52:13 1.34 @@ -1,6 +1,30 @@ # The LearningOnline Network # Feedback # +# $Id: lonfeedback.pm,v 1.34 2002/10/11 20:52:13 www Exp $ +# +# Copyright Michigan State University Board of Trustees +# +# This file is part of the LearningOnline Network with CAPA (LON-CAPA). +# +# LON-CAPA is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# LON-CAPA is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with LON-CAPA; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# /home/httpd/html/adm/gpl.txt +# +# http://www.lon-capa.org/ +# # (Internal Server Error Handler # # (Login Screen @@ -11,15 +35,27 @@ # # 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; use strict; use Apache::Constants qw(:common); use Apache::lonmsg(); +use Apache::loncommon(); +use Apache::lontexconvert(); sub mail_screen { my ($r,$feedurl,$options) = @_; + my $bodytag=&Apache::loncommon::bodytag('Resource Feedback and Discussion', + '','onLoad="window.focus();"'); $r->print(< @@ -28,26 +64,36 @@ sub mail_screen { - - -

Feedback

+$bodytag

$feedurl

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

-

- - ENDDOCUMENT +$r->print(&generate_preview_button().''); } sub fail_redirect { @@ -85,14 +128,15 @@ sub fail_redirect { -Sorry, no recipients ... + +Sorry, no recipients ... ENDFAILREDIR } sub redirect_back { - my ($r,$feedurl,$typestyle,$sendsomething,$status) = @_; + my ($r,$feedurl,$typestyle,$sendsomething,$sendposts,$status) = @_; $r->print (< Feedback sent @@ -101,8 +145,9 @@ sub redirect_back { + $typestyle -Sent $sendsomething message(s). +Sent $sendsomething message(s), and $sendposts post(s). $status @@ -116,18 +161,19 @@ sub no_redirect_back { ENDNOREDIR - if ($feedurl ne '/adm/feedback') { + if ($feedurl!~/^\/adm\/feedback/) { $r->print(''); } - $r->print (<print (< -Sorry, no feedback possible on this resource ... + +Sorry, no feedback possible on this resource ... -ENDNOREDIR +ENDNOREDIRTWO } sub screen_header { @@ -139,7 +185,7 @@ sub screen_header { } if ($ENV{'course.'.$ENV{'request.course.id'}.'.question.email'}) { $options.= - '
Question about resource content'; + '
Question about resource content'; } if ($ENV{'course.'.$ENV{'request.course.id'}.'.comment.email'}) { $options.= @@ -151,48 +197,19 @@ sub screen_header { '
'. 'Question/Comment/Feedback about course policy'; } - return $options; -} -sub get_previous_attempt { - my ($feedurl)=@_; - my $symb=&Apache::lonnet::symbread($feedurl); - my $prevattempts=''; - if ($symb) { - my $answer=&Apache::lonnet::reply( - "restore:".$ENV{'user.domain'}.':'.$ENV{'user.name'}.':'. - $ENV{'request.course.id'}.':'. - &Apache::lonnet::escape($symb), - $ENV{'user.home'}); - my %returnhash=(); - map { - my ($name,$value)=split(/\=/,$_); - $returnhash{&Apache::lonnet::unescape($name)}= - &Apache::lonnet::unescape($value); - } split(/\&/,$answer); - my %lasthash=(); - my $version; - for ($version=1;$version<=$returnhash{'version'};$version++) { - map { - $lasthash{$_}=$returnhash{$version.':'.$_}; - } split(/\:/,$returnhash{$version.':keys'}); - } - $prevattempts=''; - map { - $prevattempts.=''; - } keys %lasthash; - for ($version=1;$version<=$returnhash{'version'};$version++) { - $prevattempts.=''; - map { - $prevattempts.=''; - } keys %lasthash; - } - $prevattempts.=''; - map { - $prevattempts.=''; - } keys %lasthash; - $prevattempts.='
History'.$_.'
Attempt '.$version.''.$returnhash{$version.':'.$_}.'
Current'.$lasthash{$_}.'
'; + if ($ENV{'request.course.id'}) { + 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)'; + } } + return $options; } sub resource_output { @@ -210,6 +227,7 @@ sub resource_output { sub clear_out_html { my $message=$ENV{'form.comment'}; + $message=~s/\<\/*m\s*\>//g; $message=~s/\/\>\;/g; return $message; @@ -237,30 +255,33 @@ sub decide_receiver { my $typestyle=''; my %to=(); if ($ENV{'form.author'}) { - $typestyle.='Author Feedback
'; + $typestyle.='Submitting as Author Feedback
'; $feedurl=~/^\/res\/(\w+)\/(\w+)\//; $to{$2.':'.$1}=1; } if ($ENV{'form.question'}) { - $typestyle.='Question
'; - map { + $typestyle.='Submitting as Question
'; + foreach (split(/\,/, + $ENV{'course.'.$ENV{'request.course.id'}.'.question.email'}) + ) { $to{$_}=1; - } split(/\,/, - $ENV{'course.'.$ENV{'request.course.id'}.'.question.email'}); + } } if ($ENV{'form.course'}) { - $typestyle.='Comment
'; - map { + $typestyle.='Submitting as Comment
'; + foreach (split(/\,/, + $ENV{'course.'.$ENV{'request.course.id'}.'.comment.email'}) + ) { $to{$_}=1; - } split(/\,/, - $ENV{'course.'.$ENV{'request.course.id'}.'.comment.email'}); + } } if ($ENV{'form.policy'}) { - $typestyle.='Policy
'; - map { + $typestyle.='Submitting as Policy Feedback
'; + foreach (split(/\,/, + $ENV{'course.'.$ENV{'request.course.id'}.'.policy.email'}) + ) { $to{$_}=1; - } split(/\,/, - $ENV{'course.'.$ENV{'request.course.id'}.'.policy.email'}); + } } return ($typestyle,%to); } @@ -269,37 +290,174 @@ sub send_msg { my ($feedurl,$email,$citations,%to)=@_; my $status=''; my $sendsomething=0; - map { + foreach (keys %to) { if ($_) { - unless (&Apache::lonmsg::user_normal_msg(split(/\:/,$_),'Feedback '.$feedurl, - $email,$citations) eq 'ok') { + my $declutter=&Apache::lonnet::declutter($feedurl); + unless (&Apache::lonmsg::user_normal_msg(split(/\:/,$_), + 'Feedback ['.$declutter.']',$email,$citations)=~/ok/) { $status.='
Error sending message to '.$_.'
'; } else { - #$status.='
Message sent to '.$_.'
'; $sendsomething++; } } - } keys %to; + } + + my %record=&Apache::lonnet::restore('_feedback'); + my ($temp)=keys %record; + unless ($temp=~/^error\:/) { + my %newrecord=(); + $newrecord{'resource'}=$feedurl; + $newrecord{'subnumber'}=$record{'subnumber'}+1; + unless (&Apache::lonnet::cstore(\%newrecord,'_feedback') eq 'ok') { + $status.='
Not registered
'; + } + } + return ($status,$sendsomething); } +sub adddiscuss { + my ($symb,$email,$anon)=@_; + my $status=''; + if (&Apache::lonnet::allowed('pch',$ENV{'request.course.id'}. + ($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:''))) { + + my %contrib=('message' => $email, + 'sendername' => $ENV{'user.name'}, + 'senderdomain' => $ENV{'user.domain'}, + 'screenname' => $ENV{'environment.screenname'}, + 'plainname' => $ENV{'environment.firstname'}.' '. + $ENV{'environment.middlename'}.' '. + $ENV{'environment.lastname'}.' '. + $ENV{'enrironment.generation'}); + if ($anon) { + $contrib{'anonymous'}='true'; + } + if (($symb) && ($email)) { + $status='Adding to class discussion'.($anon?' (anonymous)':'').': '. + &Apache::lonnet::store(\%contrib,$symb,$ENV{'request.course.id'}, + $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}, + $ENV{'course.'.$ENV{'request.course.id'}.'.num'}); + my %storenewentry=($symb => time); + $status.='
Updating discussion time: '. + &Apache::lonnet::put('discussiontimes',\%storenewentry, + $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}, + $ENV{'course.'.$ENV{'request.course.id'}.'.num'}); + } + my %record=&Apache::lonnet::restore('_discussion'); + my ($temp)=keys %record; + unless ($temp=~/^error\:/) { + my %newrecord=(); + $newrecord{'resource'}=$symb; + $newrecord{'subnumber'}=$record{'subnumber'}+1; + $status.='
Registering: '. + &Apache::lonnet::cstore(\%newrecord,'_discussion'); + } + } else { + $status.='Failed.'; + } + return $status.'
'; +} + +# ----------------------------------------------------------- Preview function + +sub show_preview { + my $r=shift; + my $message=&clear_out_html($ENV{'form.comment'}); + $message=~s/\n/\
/g; + $message=&Apache::lontexconvert::msgtexconverted($message); + $r->print('
'. + $message.'
'); +} + +sub generate_preview_button { + return(< + + + +ENDPREVIEW +} sub handler { my $r = shift; - $r->content_type('text/html'); - $r->send_http_header; - return OK if $r->header_only; - + if ($r->header_only) { + $r->content_type('text/html'); + $r->send_http_header; + return OK; + } + +# --------------------------- Get query string for limited number of parameters + + &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, + ['hide','unhide','postdata','preview']); + + if (($ENV{'form.hide'}) || ($ENV{'form.unhide'})) { +# ----------------------------------------------------------------- Hide/unhide + $r->content_type('text/html'); + $r->send_http_header; + + my $entry=$ENV{'form.hide'}?$ENV{'form.hide'}:$ENV{'form.unhide'}; + + my ($symb,$idx)=split(/\:\:\:/,$entry); + my ($map,$ind,$url)=split(/\_\_\_/,$symb); + + my %contrib=&Apache::lonnet::restore($symb,$ENV{'request.course.id'}, + $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}, + $ENV{'course.'.$ENV{'request.course.id'}.'.num'}); + + + my $currenthidden=$contrib{'hidden'}; + + if ($ENV{'form.hide'}) { + $currenthidden.='.'.$idx.'.'; + } else { + $currenthidden=~s/\.$idx\.//g; + } + my %newhash=('hidden' => $currenthidden); + + &Apache::lonnet::store(\%newhash,$symb,$ENV{'request.course.id'}, + $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}, + $ENV{'course.'.$ENV{'request.course.id'}.'.num'}); + + &redirect_back($r,&Apache::lonnet::clutter($url), + 'Changed discussion status

','0','0'); + } elsif ($ENV{'form.preview'}) { +# -------------------------------------------------------- User wants a preview + &show_preview($r); + } else { +# ------------------------------------------------------------- Normal feedback my $feedurl=$ENV{'form.postdata'}; $feedurl=~s/^http\:\/\///; $feedurl=~s/^$ENV{'SERVER_NAME'}//; $feedurl=~s/^$ENV{'HTTP_HOST'}//; + + my $symb=&Apache::lonnet::symbread($feedurl); + unless ($symb) { + $symb=$ENV{'form.symb'}; + if ($symb) { + my ($map,$id,$url)=split(/\_\_\_/,$symb); + $feedurl=&Apache::lonnet::clutter($url); + } + } + my $goahead=1; + if ($feedurl=~/\.(problem|exam|quiz|assess|survey|form)$/) { + unless ($symb) { $goahead=0; } + } + + if ($goahead) { +# Go ahead with feedback, no ambiguous reference + $r->content_type('text/html'); + $r->send_http_header; - if ( + if ( ( ($feedurl=~m:^/res:) && ($feedurl!~m:^/res/adm:) ) || ($ENV{'request.course.id'} && ($feedurl!~m:^/adm:)) + || + ($ENV{'request.course.id'} && ($symb=~/^bulletin\_\_\_/)) ) { # --------------------------------------------------- Print login screen header unless ($ENV{'form.sendit'}) { @@ -312,7 +470,9 @@ sub handler { } else { # Get previous user input - my $prevattempts=&get_previous_attempt($feedurl); + my $prevattempts=&Apache::loncommon::get_previous_attempt( + $symb,$ENV{'user.name'},$ENV{'user.domain'}, + $ENV{'request.course.id'}); # Get output from resource my $usersaw=&resource_output($feedurl); @@ -321,7 +481,8 @@ sub handler { my $message=&clear_out_html; # Assemble email - my ($email,$citations)=&assemble_email($feedurl,$message,$prevattempts,$usersaw); + my ($email,$citations)=&assemble_email($feedurl,$message,$prevattempts, + $usersaw); # Who gets this? my ($typestyle,%to) = &decide_receiver($feedurl); @@ -329,19 +490,35 @@ sub handler { # Actually send mail my ($status,$numsent)=&send_msg($feedurl,$email,$citations,%to); +# Discussion? Store that. + + my $numpost=0; + if ($ENV{'form.discuss'}) { + $typestyle.=&adddiscuss($symb,$message); + $numpost++; + } + + if ($ENV{'form.anondiscuss'}) { + $typestyle.=&adddiscuss($symb,$message,1); + $numpost++; + } + + # Receipt screen and redirect back to where came from - &redirect_back($r,$feedurl,$typestyle,$status,$numsent); + &redirect_back($r,$feedurl,$typestyle,$numsent,$numpost,$status); } - } else { + } else { # Unable to give feedback &no_redirect_back($r,$feedurl); + } + } else { +# Ambiguous Problem Resource + $r->internal_redirect('/adm/ambiguous'); } +} return OK; } 1; __END__ - - -