--- loncom/interface/lonfeedback.pm 2001/07/25 16:08:38 1.10 +++ loncom/interface/lonfeedback.pm 2002/10/03 15:04:29 1.33 @@ -1,6 +1,30 @@ # The LearningOnline Network # Feedback # +# $Id: lonfeedback.pm,v 1.33 2002/10/03 15:04:29 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 @@ -14,6 +38,11 @@ # 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; @@ -21,9 +50,12 @@ 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(< @@ -32,31 +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 { @@ -102,7 +136,7 @@ ENDFAILREDIR } sub redirect_back { - my ($r,$feedurl,$typestyle,$sendsomething,$status) = @_; + my ($r,$feedurl,$typestyle,$sendsomething,$sendposts,$status) = @_; $r->print (< Feedback sent @@ -113,7 +147,7 @@ sub redirect_back { $typestyle -Sent $sendsomething message(s). +Sent $sendsomething message(s), and $sendposts post(s). $status @@ -163,9 +197,17 @@ sub screen_header { '
'. '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'}:''))) { $options.='
'. 'Contribution to course discussion of resource'; + $options.='
'. + 'Anonymous contribution to course discussion of resource'. + ' (name only visible to course faculty)'; + } } return $options; } @@ -185,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; @@ -218,24 +261,27 @@ sub decide_receiver { } if ($ENV{'form.question'}) { $typestyle.='Submitting as Question
'; - map { + 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.='Submitting as Comment
'; - map { + 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.='Submitting as Policy Feedback
'; - map { + foreach (split(/\,/, + $ENV{'course.'.$ENV{'request.course.id'}.'.policy.email'}) + ) { $to{$_}=1; - } split(/\,/, - $ENV{'course.'.$ENV{'request.course.id'}.'.policy.email'}); + } } return ($typestyle,%to); } @@ -244,20 +290,95 @@ sub send_msg { my ($feedurl,$email,$citations,%to)=@_; my $status=''; my $sendsomething=0; - map { + foreach (keys %to) { if ($_) { + my $declutter=&Apache::lonnet::declutter($feedurl); unless (&Apache::lonmsg::user_normal_msg(split(/\:/,$_), - 'Feedback '.$feedurl,$email,$citations) eq 'ok') { + 'Feedback ['.$declutter.']',$email,$citations) eq '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; if ($r->header_only) { @@ -265,13 +386,60 @@ sub handler { $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; } @@ -288,6 +456,8 @@ sub handler { ) || ($ENV{'request.course.id'} && ($feedurl!~m:^/adm:)) + || + ($ENV{'request.course.id'} && ($symb=~/^bulletin\_\_\_/)) ) { # --------------------------------------------------- Print login screen header unless ($ENV{'form.sendit'}) { @@ -301,7 +471,7 @@ sub handler { # Get previous user input my $prevattempts=&Apache::loncommon::get_previous_attempt( - $symb,$ENV{'user.name'},$ENV{'user.domain'},$ENV{'user.home'}, + $symb,$ENV{'user.name'},$ENV{'user.domain'}, $ENV{'request.course.id'}); # Get output from resource @@ -320,8 +490,22 @@ 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,$numsent,$status); + &redirect_back($r,$feedurl,$typestyle,$numsent,$numpost,$status); } } else { @@ -332,11 +516,9 @@ sub handler { # Ambiguous Problem Resource $r->internal_redirect('/adm/ambiguous'); } +} return OK; } 1; __END__ - - -