--- loncom/interface/lonfeedback.pm 2001/02/09 21:53:08 1.7
+++ loncom/interface/lonfeedback.pm 2002/04/03 18:47:39 1.26
@@ -1,6 +1,30 @@
# The LearningOnline Network
# Feedback
#
+# $Id: lonfeedback.pm,v 1.26 2002/04/03 18:47:39 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,12 +35,21 @@
#
# 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();
sub mail_screen {
my ($r,$feedurl,$options) = @_;
@@ -28,26 +61,36 @@ sub mail_screen {
<script>
function gosubmit() {
var rec=0;
- if (document.mailform.elements.author!=undefined) {
+ if (typeof(document.mailform.elements.author)!="undefined") {
if (document.mailform.elements.author.checked) {
rec=1;
}
}
- if (document.mailform.elements.question!=undefined) {
+ if (typeof(document.mailform.elements.question)!="undefined") {
if (document.mailform.elements.question.checked) {
rec=1;
}
}
- if (document.mailform.elements.course!=undefined) {
+ if (typeof(document.mailform.elements.course)!="undefined") {
if (document.mailform.elements.course.checked) {
rec=1;
}
}
- if (document.mailform.elements.policy!=undefined) {
+ if (typeof(document.mailform.elements.policy)!="undefined") {
if (document.mailform.elements.policy.checked) {
rec=1;
}
}
+ if (typeof(document.mailform.elements.discuss)!="undefined") {
+ if (document.mailform.elements.discuss.checked) {
+ rec=1;
+ }
+ }
+ if (typeof(document.mailform.elements.anondiscuss)!="undefined") {
+ if (document.mailform.elements.anondiscuss.checked) {
+ rec=1;
+ }
+ }
if (rec) {
document.mailform.submit();
@@ -66,7 +109,7 @@ sub mail_screen {
Please check at least one of the following feedback types:
$options<hr>
My question/comment/feedback:<p>
-<textarea name=comment cols=60 rows=10>
+<textarea name=comment cols=60 rows=10 wrap=hard>
</textarea><p>
<input type=hidden name=sendit value=1>
<input type=button value="Send Feedback" onClick='gosubmit();'></input>
@@ -85,7 +128,8 @@ sub fail_redirect {
</head>
<html>
<body bgcolor="#FFFFFF">
-Sorry, no recipients ...
+<img align=right src=/adm/lonIcons/lonlogos.gif>
+<b>Sorry, no recipients ...</b>
</body>
</html>
ENDFAILREDIR
@@ -101,6 +145,7 @@ sub redirect_back {
</head>
<html>
<body bgcolor="#FFFFFF">
+<img align=right src=/adm/lonIcons/lonlogos.gif>
$typestyle
<b>Sent $sendsomething message(s).</b>
<font color=red>$status</font>
@@ -116,18 +161,19 @@ sub no_redirect_back {
<meta http-equiv="pragma" content="no-cache"></meta>
ENDNOREDIR
- if ($feedurl ne '/adm/feedback') {
+ if ($feedurl!~/^\/adm\/feedback/) {
$r->print('<meta HTTP-EQUIV="Refresh" CONTENT="2; url='.$feedurl.'">');
}
- $r->print (<<ENDNOREDIR);
+ $r->print (<<ENDNOREDIRTWO);
</head>
<html>
<body bgcolor="#FFFFFF">
-Sorry, no feedback possible on this resource ...
+<img align=right src=/adm/lonIcons/lonlogos.gif>
+<b>Sorry, no feedback possible on this resource ...</b>
</body>
</html>
-ENDNOREDIR
+ENDNOREDIRTWO
}
sub screen_header {
@@ -139,7 +185,7 @@ sub screen_header {
}
if ($ENV{'course.'.$ENV{'request.course.id'}.'.question.email'}) {
$options.=
- '<br><input type=checkbox name=question> Question about resource content';
+ '<br><input type=checkbox name=question> Question about resource content';
}
if ($ENV{'course.'.$ENV{'request.course.id'}.'.comment.email'}) {
$options.=
@@ -151,48 +197,19 @@ sub screen_header {
'<br><input type=checkbox name=policy> '.
'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='<table border=2></tr><th>History</th>';
- map {
- $prevattempts.='<th>'.$_.'</th>';
- } keys %lasthash;
- for ($version=1;$version<=$returnhash{'version'};$version++) {
- $prevattempts.='</tr><tr><th>Attempt '.$version.'</th>';
- map {
- $prevattempts.='<td>'.$returnhash{$version.':'.$_}.'</td>';
- } keys %lasthash;
- }
- $prevattempts.='</tr><tr><th>Current</th>';
- map {
- $prevattempts.='<td>'.$lasthash{$_}.'</td>';
- } keys %lasthash;
- $prevattempts.='</tr></table>';
+ if ($ENV{'request.course.id'}) {
+ if (&Apache::lonnet::allowed('pch',
+ $ENV{'request.course.id'}.
+ ($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:''))) {
+ $options.='<br><input type=checkbox name=discuss> '.
+ '<b>Contribution to course discussion of resource</b>';
+ $options.='<br><input type=checkbox name=anondiscuss> '.
+ '<b>Anonymous contribution to course discussion of resource</b>'.
+ ' (name only visible to course faculty)';
+ }
}
+ return $options;
}
sub resource_output {
@@ -237,30 +254,33 @@ sub decide_receiver {
my $typestyle='';
my %to=();
if ($ENV{'form.author'}) {
- $typestyle.='Author Feedback<br>';
+ $typestyle.='Submitting as Author Feedback<br>';
$feedurl=~/^\/res\/(\w+)\/(\w+)\//;
$to{$2.':'.$1}=1;
}
if ($ENV{'form.question'}) {
- $typestyle.='Question<br>';
- map {
+ $typestyle.='Submitting as Question<br>';
+ 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<br>';
- map {
+ $typestyle.='Submitting as Comment<br>';
+ 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<br>';
- map {
+ $typestyle.='Submitting as Policy Feedback<br>';
+ 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,32 +289,146 @@ 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) eq 'ok') {
$status.='<br>Error sending message to '.$_.'<br>';
} else {
- #$status.='<br>Message sent to '.$_.'<br>';
$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.='<br>Not registered<br>';
+ }
+ }
+
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.='<br>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.='<br>Registering: '.
+ &Apache::lonnet::cstore(\%newrecord,'_discussion');
+ }
+ } else {
+ $status.='Failed.';
+ }
+ return $status.'<br>';
+}
+
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
+
+ foreach (split(/&/,$ENV{'QUERY_STRING'})) {
+ my ($name, $value) = split(/=/,$_);
+ $value =~ tr/+/ /;
+ $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg;
+ if (($name eq 'hide') || ($name eq 'unhide') || ($name eq 'postdata')) {
+ unless ($ENV{'form.'.$name}) {
+ $ENV{'form.'.$name}=$value;
+ }
+ }
+ }
+
+ 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,'/res/'.$url,'Changed discussion status<p>','0');
+
+
+ } 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);
+ 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:)
)
@@ -312,7 +446,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 +457,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,14 +466,30 @@ sub handler {
# Actually send mail
my ($status,$numsent)=&send_msg($feedurl,$email,$citations,%to);
+# Discussion? Store that.
+
+ if ($ENV{'form.discuss'}) {
+ $typestyle.=&adddiscuss($symb,$message);
+ }
+
+ if ($ENV{'form.anondiscuss'}) {
+ $typestyle.=&adddiscuss($symb,$message,1);
+ }
+
+
# Receipt screen and redirect back to where came from
- &redirect_back($r,$feedurl,$typestyle,$status,$numsent);
+ &redirect_back($r,$feedurl,$typestyle,$numsent,$status);
}
- } else {
+ } else {
# Unable to give feedback
&no_redirect_back($r,$feedurl);
+ }
+ } else {
+# Ambiguous Problem Resource
+ $r->internal_redirect('/adm/ambiguous');
}
+}
return OK;
}
@@ -345,3 +498,4 @@ __END__
+