--- loncom/interface/lonfeedback.pm 2003/03/30 21:58:17 1.43
+++ loncom/interface/lonfeedback.pm 2003/09/09 18:46:28 1.52
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Feedback
#
-# $Id: lonfeedback.pm,v 1.43 2003/03/30 21:58:17 www Exp $
+# $Id: lonfeedback.pm,v 1.52 2003/09/09 18:46:28 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -56,6 +56,9 @@ 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(<<ENDDOCUMENT);
<html>
<head>
@@ -104,13 +107,14 @@ sub mail_screen {
</script>
</head>
$bodytag
-<h2><tt>$feedurl</tt></h2>
+<h2><tt>$title</tt></h2>
<form action="/adm/feedback" method="post" name="mailform"
enctype="multipart/form-data">
<input type=hidden name=postdata value="$feedurl">
Please check at least one of the following feedback types:
$options<hr>
My question/comment/feedback:<p>
+$latexHelp
<textarea name=comment cols=60 rows=10 wrap=hard>
</textarea><p>
Attachment (128 KB max size): <input type="file" name="attachment" />
@@ -149,11 +153,13 @@ sub redirect_back {
<meta HTTP-EQUIV="Refresh" CONTENT="2; url=$feedurl">
</head>
<html>
-<body bgcolor="#FFFFFF">
+<body bgcolor="#FFFFFF" onLoad='if (window.name!="loncapaclient") { this.document.reldt.submit(); self.close(); }'>
<img align=right src=/adm/lonIcons/lonlogos.gif>
$typestyle
<b>Sent $sendsomething message(s), and $sendposts post(s).</b>
<font color=red>$status</font>
+<form name="reldt" action="$feedurl" target="loncapaclient">
+</form>
</body>
</html>
ENDREDIR
@@ -173,7 +179,7 @@ ENDNOREDIR
$r->print (<<ENDNOREDIRTWO);
</head>
<html>
-<body bgcolor="#FFFFFF">
+<body bgcolor="#FFFFFF" onLoad='if (window.name!="loncapaclient") { self.close(); }'>
<img align=right src=/adm/lonIcons/lonlogos.gif>
<b>Sorry, no feedback possible on this resource ...</b>
</body>
@@ -183,22 +189,23 @@ ENDNOREDIRTWO
sub screen_header {
my ($feedurl) = @_;
- my $options='';
+ my $msgoptions='';
+ my $discussoptions='';
if (($feedurl=~/^\/res\//) && ($feedurl!~/^\/res\/adm/)) {
- $options=
+ $msgoptions=
'<p><input type=checkbox name=author> Feedback to resource author';
}
if (&feedback_available(1)) {
- $options.=
+ $msgoptions.=
'<br><input type=checkbox name=question> Question about resource content';
}
if (&feedback_available(0,1)) {
- $options.=
+ $msgoptions.=
'<br><input type=checkbox name=course> '.
'Question/Comment/Feedback about course content';
}
if (&feedback_available(0,0,1)) {
- $options.=
+ $msgoptions.=
'<br><input type=checkbox name=policy> '.
'Question/Comment/Feedback about course policy';
}
@@ -207,19 +214,22 @@ sub screen_header {
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)';
+ $discussoptions='<input type="checkbox" name="discuss" onClick="this.form.anondiscuss.checked=false;"> '.
+ 'Contribution to course discussion of resource';
+ $discussoptions.='<br><input type="checkbox" name="anondiscuss" onClick="this.form.discuss.checked=false;"> '.
+ 'Anonymous contribution to course discussion of resource'.
+ ' <i>(name only visible to course faculty)</i>';
}
}
- return $options;
+ if ($msgoptions) { $msgoptions='<h2>Sending Messages</h2>'.$msgoptions; }
+ if ($discussoptions) {
+ $discussoptions='<h2>Discussion Contributions</h2>'.$discussoptions; }
+ return $msgoptions.$discussoptions;
}
sub resource_output {
my ($feedurl) = @_;
- my $usersaw=&Apache::lonnet::ssi($feedurl);
+ my $usersaw=&Apache::lonnet::ssi_body($feedurl);
$usersaw=~s/\<body[^\>]*\>//gi;
$usersaw=~s/\<\/body\>//gi;
$usersaw=~s/\<html\>//gi;
@@ -241,9 +251,9 @@ sub clear_out_html {
BR=>1, TT=>1, STRONG=>1, BLOCKQUOTE=>1, DIV=>1, IMG=>1);
$message =~ s/\<(\/?\s*(\w+)[^\>\<]*)/
- {($html{uc($2)}&(length($1)<1000))?"\<$1":"\<$1"}/ge;
+ {($html{uc($2)}&&(length($1)<1000))?"\<$1":"\<$1"}/ge;
$message =~ s/(\<?\s*(\w+)[^\<\>]*)\>/
- {($html{uc($2)}&(length($1)<1000))?"$1\>":"$1\>"}/ge;
+ {($html{uc($2)}&&(length($1)<1000))?"$1\>":"$1\>"}/ge;
} else {
$message=~s/\<\/*m\s*\>//g;
$message=~s/\</\<\;/g;
@@ -455,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'},
@@ -485,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'},
@@ -518,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);
}
}
@@ -559,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'}) {