--- loncom/interface/lonfeedback.pm 2003/02/18 15:47:40 1.41
+++ loncom/interface/lonfeedback.pm 2004/01/28 16:10:26 1.75
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Feedback
#
-# $Id: lonfeedback.pm,v 1.41 2003/02/18 15:47:40 albertel Exp $
+# $Id: lonfeedback.pm,v 1.75 2004/01/28 16:10:26 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -51,17 +51,231 @@ use Apache::Constants qw(:common);
use Apache::lonmsg();
use Apache::loncommon();
use Apache::lontexconvert();
+use Apache::lonlocal;
+
+sub list_discussion {
+ my ($mode,$status,$symb)=@_;
+ &Apache::lonnet::logthis("status is $status");
+ if (!($status eq 'CAN_ANSWER' || $status eq 'CANNOT_ANSWER')) {
+ return '';
+ }
+ my $discussiononly=0;
+ if ($mode eq 'board') { $discussiononly=1; }
+ unless ($ENV{'request.course.id'}) { return ''; }
+ my $crs='/'.$ENV{'request.course.id'};
+ if ($ENV{'request.course.sec'}) {
+ $crs.='_'.$ENV{'request.course.sec'};
+ }
+ $crs=~s/\_/\//g;
+ unless ($symb) {
+ $symb=&Apache::lonnet::symbread();
+ }
+ unless ($symb) { return ''; }
+ my $seeid=&Apache::lonnet::allowed('rin',$crs);
+ my $viewgrades=&Apache::lonnet::allowed('vgr',$crs);
+ my @discussionitems=();
+ # backward compatibility (bulletin boards used to be 'wrapped')
+ my $ressymb=$symb;
+ if ($mode eq 'board') {
+ $ressymb=~s|(bulletin___\d+___)|$1adm/wrapper|;
+ }
+ my %contrib=&Apache::lonnet::restore($ressymb,$ENV{'request.course.id'},
+ $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+ $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+ my $visible=0;
+ my @depth=();
+ my @original=();
+ my @index=();
+ my @replies=();
+ my %alldiscussion=();
+ my $maxdepth=0;
+
+ my $target='';
+ unless ($ENV{'browser.interface'} eq 'textual' ||
+ $ENV{'environment.remote'} eq 'off' ) {
+ $target='target="LONcom"';
+ }
+ if ($contrib{'version'}) {
+ for (my $id=1;$id<=$contrib{'version'};$id++) {
+ my $idx=$id;
+ my $hidden=($contrib{'hidden'}=~/\.$idx\./);
+ my $deleted=($contrib{'deleted'}=~/\.$idx\./);
+ my $origindex='0.';
+ if (($contrib{$idx.':replyto'}) && ($ENV{'environment.threadeddiscussion'})) {
+# this is a follow-up message
+ $original[$idx]=$original[$contrib{$idx.':replyto'}];
+ $depth[$idx]=$depth[$contrib{$idx.':replyto'}]+1;
+ $origindex=$index[$contrib{$idx.':replyto'}];
+ if ($depth[$idx]>$maxdepth) { $maxdepth=$depth[$idx]; }
+ } else {
+# this is an original message
+ $original[$idx]=0;
+ $depth[$idx]=0;
+ }
+ if ($replies[$depth[$idx]]) {
+ $replies[$depth[$idx]]++;
+ } else {
+ $replies[$depth[$idx]]=1;
+ }
+ unless ((($hidden) && (!$seeid)) || ($deleted)) {
+ $visible++;
+ my $message=$contrib{$idx.':message'};
+ $message=~s/\n/\<br \/\>/g;
+ $message=&Apache::lontexconvert::msgtexconverted($message);
+ if ($contrib{$idx.':attachmenturl'}) {
+ my ($fname,$ft)
+ =($contrib{$idx.':attachmenturl'}=~/\/(\w+)\.(\w+)$/);
+ $message.='<p>'.&mt('Attachment').': <a href="'.
+ &Apache::lonnet::tokenwrapper(
+ $contrib{$idx.':attachmenturl'}).
+ '"><tt>'.$fname.'.'.$ft.'</tt></a></p>';
+ }
+ if ($message) {
+ if ($hidden) {
+ $message='<font color="#888888">'.$message.'</font>';
+ }
+ my $screenname=&Apache::loncommon::screenname(
+ $contrib{$idx.':sendername'},
+ $contrib{$idx.':senderdomain'});
+ my $plainname=&Apache::loncommon::nickname(
+ $contrib{$idx.':sendername'},
+ $contrib{$idx.':senderdomain'});
+
+ my $sender=&mt('Anonymous');
+ if ((!$contrib{$idx.':anonymous'}) || ($seeid)) {
+ $sender=&Apache::loncommon::aboutmewrapper(
+ $plainname,
+ $contrib{$idx.':sendername'},
+ $contrib{$idx.':senderdomain'}).' ('.
+ $contrib{$idx.':sendername'}.' at '.
+ $contrib{$idx.':senderdomain'}.')';
+ if ($contrib{$idx.':anonymous'}) {
+ $sender.=' ['.&mt('anonymous').'] '.
+ $screenname;
+ }
+ if ($seeid) {
+ if ($hidden) {
+ $sender.=' <a href="/adm/feedback?unhide='.
+ $symb.':::'.$idx.'">'.&mt('Make Visible').'</a>';
+ } else {
+ $sender.=' <a href="/adm/feedback?hide='.
+ $symb.':::'.$idx.'">'.&mt('Hide').'</a>';
+ }
+ $sender.=' <a href="/adm/feedback?deldisc='.
+ $symb.':::'.$idx.'">'.&mt('Delete').'</a>';
+ }
+ if (&Apache::lonnet::allowed('pch',
+ $ENV{'request.course.id'}.
+ ($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:''))) {
+ $sender.=' <a href="/adm/feedback?replydisc='.
+ $symb.':::'.$idx.'" '.$target.'>'.&mt('Reply').'</a>';
+ }
+ } else {
+ if ($screenname) {
+ $sender='<i>'.$screenname.'</i>';
+ }
+ }
+ my $vgrlink;
+ if ($viewgrades) {
+ $vgrlink=&Apache::loncommon::submlink('Submissions',
+ $contrib{$idx.':sendername'},$contrib{$idx.':senderdomain'},$symb);
+ }
+#figure out at what position this needs to print
+ my $thisindex=$idx;
+ if ($ENV{'environment.threadeddiscussion'}) {
+ $thisindex=$origindex.substr('00'.$replies[$depth[$idx]],-2,2);
+ }
+ $alldiscussion{$thisindex}=$idx;
+ $index[$idx]=$thisindex;
+ $discussionitems[$idx]='<p><b>'.$sender.'</b> '.$vgrlink.' ('.
+ localtime($contrib{$idx.':timestamp'}).
+ '):<blockquote>'.$message.
+ '</blockquote></p>';
+ }
+ }
+ }
+ }
+ my $discussion='';
+ if ($visible) {
+# Print a the discusssion
+ $discussion.='<table bgcolor="#AAAAAA" cellpadding="2" cellspacing="2" border="0">';
+ if ($visible>2) {
+ my $colspan=$maxdepth+1;
+ $discussion.='<tr><td bgcolor="DDDDBB" colspan="'.$colspan.'">'.
+ '<a href="/adm/feedback?threadedon='.$symb.'">'.&mt('Threaded View').'</a> '.
+ '<a href="/adm/feedback?threadedoff='.$symb.'">'.&mt('Chronological View').'</a>'.
+ '</td></tr>';
+ }
+
+ foreach (sort { $a <=> $b } keys %alldiscussion) {
+ $discussion.="\n<tr>";
+ my $thisdepth=$depth[$alldiscussion{$_}];
+ for (1..$thisdepth) {
+ $discussion.='<td> </td>';
+ }
+ my $colspan=$maxdepth-$thisdepth+1;
+ $discussion.="<td bgcolor='#CCCCCC' colspan='".$colspan."'>".$discussionitems[$alldiscussion{$_}].
+ "</td></tr>";
+ }
+ $discussion.='</table>';
+ }
+ if ($discussiononly) {
+ $discussion.=(<<ENDDISCUSS);
+<form action="/adm/feedback" method="post" name="mailform" enctype="multipart/form-data">
+<input type="submit" name="discuss" value="Post Discussion" />
+<input type="submit" name="anondiscuss" value="Post Anonymous Discussion" />
+<input type="hidden" name="symb" value="$ressymb" />
+<input type="hidden" name="sendit" value="true" />
+<br />
+<font size="1">Note: in anonymous discussion, your name is visible only to
+course faculty</font><br />
+<textarea name="comment" cols="60" rows="10" wrap="hard"></textarea>
+<p>
+Attachment (128 KB max size): <input type="file" name="attachment" />
+</p>
+</form>
+ENDDISCUSS
+ $discussion.=&generate_preview_button();
+ } else {
+ if (&Apache::lonnet::allowed('pch',
+ $ENV{'request.course.id'}.
+ ($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:''))) {
+ $discussion.='<table bgcolor="#BBBBBB"><tr><td><a href="/adm/feedback?replydisc='.
+ $symb.':::" '.$target.'>'.
+ '<img src="/adm/lonMisc/chat.gif" border="0" />'.
+ &mt('Post Discussion').'</a></td></tr></table>';
+ }
+ }
+ return $discussion;
+}
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 $quote='';
+ if ($ENV{'form.replydisc'}) {
+ my ($symb,$idx)=split(/\:\:\:/,$ENV{'form.replydisc'});
+ my %contrib=&Apache::lonnet::restore($symb,$ENV{'request.course.id'},
+ $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+ $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+ unless (($contrib{'hidden'}=~/\.$idx\./) || ($contrib{'deleted'}=~/\.$idx\./)) {
+ my $message=$contrib{$idx.':message'};
+ $message=~s/\n/\<br \/\>/g;
+ $quote='<blockquote>'.&Apache::lontexconvert::msgtexconverted($message).'</blockquote>';
+ }
+ }
+ my $latexHelp = Apache::loncommon::helpLatexCheatsheet();
+ my $send=&mt('Send');
$r->print(<<ENDDOCUMENT);
<html>
<head>
<title>The LearningOnline Network with CAPA</title>
<meta http-equiv="pragma" content="no-cache"></meta>
-<script>
+<script type="text/javascript">
+//<!--
function gosubmit() {
var rec=0;
if (typeof(document.mailform.elements.author)!="undefined") {
@@ -101,19 +315,30 @@ sub mail_screen {
alert('Please check a feedback type.');
}
}
+//-->
</script>
</head>
$bodytag
-<h2><tt>$feedurl</tt></h2>
-<form action="/adm/feedback" method=post name=mailform>
-<input type=hidden name=postdata value="$feedurl">
+<h2><tt>$title</tt></h2>
+<form action="/adm/feedback" method="post" name="mailform"
+enctype="multipart/form-data">
+<input type="hidden" name="postdata" value="$feedurl" />
+<input type="hidden" name="replydisc" value="$ENV{'form.replydisc'}" />
Please check at least one of the following feedback types:
-$options<hr>
-My question/comment/feedback:<p>
-<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>
+$options<hr />
+$quote
+<p>My question/comment/feedback:</p>
+<p>
+$latexHelp
+<textarea name="comment" cols="60" rows="10" wrap="hard">
+</textarea></p>
+<p>
+Attachment (128 KB max size): <input type="file" name="attachment" />
+</p>
+<p>
+<input type="hidden" name="sendit" value="1" />
+<input type="button" value="$send" onClick='gosubmit();' />
+</p>
</form>
ENDDOCUMENT
$r->print(&generate_preview_button().'</body></html>');
@@ -121,14 +346,15 @@ $r->print(&generate_preview_button().'</
sub fail_redirect {
my ($r,$feedurl) = @_;
+ if ($feedurl=~/^\/adm\//) { $feedurl.='?register=1' };
$r->print (<<ENDFAILREDIR);
+<html>
<head><title>Feedback not sent</title>
-<meta http-equiv="pragma" content="no-cache"></meta>
-<meta HTTP-EQUIV="Refresh" CONTENT="2; url=$feedurl">
+<meta http-equiv="pragma" content="no-cache" />
+<meta HTTP-EQUIV="Refresh" CONTENT="2; url=$feedurl" />
</head>
-<html>
<body bgcolor="#FFFFFF">
-<img align=right src=/adm/lonIcons/lonlogos.gif>
+<img align="right" src="/adm/lonIcons/lonlogos.gif" />
<b>Sorry, no recipients ...</b>
</body>
</html>
@@ -137,18 +363,21 @@ ENDFAILREDIR
sub redirect_back {
my ($r,$feedurl,$typestyle,$sendsomething,$sendposts,$status) = @_;
+ if ($feedurl=~/^\/adm\//) { $feedurl.='?register=1' };
$r->print (<<ENDREDIR);
+<html>
<head>
<title>Feedback sent</title>
-<meta http-equiv="pragma" content="no-cache"></meta>
+<meta http-equiv="pragma" content="no-cache" />
<meta HTTP-EQUIV="Refresh" CONTENT="2; url=$feedurl">
</head>
-<html>
-<body bgcolor="#FFFFFF">
-<img align=right src=/adm/lonIcons/lonlogos.gif>
+<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>
+<font color="red">$status</font>
+<form name="reldt" action="$feedurl" target="loncapaclient">
+</form>
</body>
</html>
ENDREDIR
@@ -157,8 +386,9 @@ ENDREDIR
sub no_redirect_back {
my ($r,$feedurl) = @_;
$r->print (<<ENDNOREDIR);
+<html>
<head><title>Feedback not sent</title>
-<meta http-equiv="pragma" content="no-cache"></meta>
+<meta http-equiv="pragma" content="no-cache" />
ENDNOREDIR
if ($feedurl!~/^\/adm\/feedback/) {
@@ -167,9 +397,8 @@ ENDNOREDIR
$r->print (<<ENDNOREDIRTWO);
</head>
-<html>
-<body bgcolor="#FFFFFF">
-<img align=right src=/adm/lonIcons/lonlogos.gif>
+<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>
</html>
@@ -177,44 +406,52 @@ ENDNOREDIRTWO
}
sub screen_header {
- my ($feedurl) = @_;
- my $options='';
- if (($feedurl=~/^\/res\//) && ($feedurl!~/^\/res\/adm/)) {
- $options=
- '<p><input type=checkbox name=author> Feedback to resource author';
- }
- if (&feedback_available(1)) {
- $options.=
- '<br><input type=checkbox name=question> Question about resource content';
- }
- if (&feedback_available(0,1)) {
- $options.=
- '<br><input type=checkbox name=course> '.
- 'Question/Comment/Feedback about course content';
- }
- if (&feedback_available(0,0,1)) {
- $options.=
- '<br><input type=checkbox name=policy> '.
- '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.='<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)';
+ my ($feedurl) = @_;
+ my $msgoptions='';
+ my $discussoptions='';
+ unless ($ENV{'form.replydisc'}) {
+ if (($feedurl=~/^\/res\//) && ($feedurl!~/^\/res\/adm/)) {
+ $msgoptions=
+ '<p><input type="checkbox" name="author" /> '.
+ &mt('Feedback to resource author').'</p>';
+ }
+ if (&feedback_available(1)) {
+ $msgoptions.=
+ '<br /><input type="checkbox" name="question" /> '.
+ &mt('Question about resource content');
+ }
+ if (&feedback_available(0,1)) {
+ $msgoptions.=
+ '<br /><input type="checkbox" name="course" /> '.
+ &mt('Question/Comment/Feedback about course content');
+ }
+ if (&feedback_available(0,0,1)) {
+ $msgoptions.=
+ '<br /><input type="checkbox" name="policy" /> '.
+ &mt('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'}:''))) {
+ $discussoptions='<input type="checkbox" name="discuss" onClick="this.form.anondiscuss.checked=false;" '.
+ ($ENV{'form.replydisc'}?' checked="1"':'').' /> '.
+ &mt('Contribution to course discussion of resource');
+ $discussoptions.='<br /><input type="checkbox" name="anondiscuss" onClick="this.form.discuss.checked=false;" /> '.
+ &mt('Anonymous contribution to course discussion of resource').
+ ' <i>('.&mt('name only visible to course faculty').')</i>';
}
- }
- return $options;
+ }
+ if ($msgoptions) { $msgoptions='<h2><img src="/adm/lonMisc/feedback.gif" />'.&mt('Sending Messages').'</h2>'.$msgoptions; }
+ if ($discussoptions) {
+ $discussoptions='<h2><img src="/adm/lonMisc/chat.gif" />'.&mt('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;
@@ -233,14 +470,14 @@ sub clear_out_html {
# allows <B> <I> <P> <A> <LI> <OL> <UL> <EM> <BR> <TT> <STRONG>
# <BLOCKQUOTE> <DIV .*> <DIV> <IMG>
my %html=(B=>1, I=>1, P=>1, A=>1, LI=>1, OL=>1, UL=>1, EM=>1,
- BR=>1, TT=>1, STRONG=>1, BLOCKQUOTE=>1, DIV=>1, IMG=>1);
+ BR=>1, TT=>1, STRONG=>1, BLOCKQUOTE=>1, DIV=>1, IMG=>1,
+ M=>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;
$message=~s/\>/\>\;/g;
}
@@ -257,7 +494,7 @@ ENDEMAIL
my $citations=<<"ENDCITE";
<h2>Previous attempts of student (if applicable)</h2>
$prevattempts
-<p><hr>
+<br /><hr />
<h2>Original screen output (if applicable)</h2>
$usersaw
<h2>Correct Answer(s) (if applicable)</h2>
@@ -304,7 +541,7 @@ sub decide_receiver {
}
}
if ($ENV{'form.course'}||$course) {
- $typestyle.='Submitting as Comment<br>';
+ $typestyle.='Submitting as Comment<br />';
foreach (split(/\,/,
$ENV{'course.'.$ENV{'request.course.id'}.'.comment.email'})
) {
@@ -313,7 +550,7 @@ sub decide_receiver {
}
}
if ($ENV{'form.policy'}||$policy) {
- $typestyle.='Submitting as Policy Feedback<br>';
+ $typestyle.='Submitting as Policy Feedback<br />';
foreach (split(/\,/,
$ENV{'course.'.$ENV{'request.course.id'}.'.policy.email'})
) {
@@ -335,15 +572,16 @@ sub feedback_available {
}
sub send_msg {
- my ($feedurl,$email,$citations,%to)=@_;
+ my ($feedurl,$email,$citations,$attachmenturl,%to)=@_;
my $status='';
my $sendsomething=0;
foreach (keys %to) {
if ($_) {
my $declutter=&Apache::lonnet::declutter($feedurl);
unless (&Apache::lonmsg::user_normal_msg(split(/\:/,$_),
- 'Feedback ['.$declutter.']',$email,$citations,$feedurl)=~/ok/) {
- $status.='<br>Error sending message to '.$_.'<br>';
+ 'Feedback ['.$declutter.']',$email,$citations,$feedurl,
+ $attachmenturl)=~/ok/) {
+ $status.='<br />'.&mt('Error sending message to').' '.$_.'<br />';
} else {
$sendsomething++;
}
@@ -357,7 +595,7 @@ sub send_msg {
$newrecord{'resource'}=$feedurl;
$newrecord{'subnumber'}=$record{'subnumber'}+1;
unless (&Apache::lonnet::cstore(\%newrecord,'_feedback') eq 'ok') {
- $status.='<br>Not registered<br>';
+ $status.='<br />'.&mt('Not registered').'<br />';
}
}
@@ -365,7 +603,7 @@ sub send_msg {
}
sub adddiscuss {
- my ($symb,$email,$anon)=@_;
+ my ($symb,$email,$anon,$attachmenturl)=@_;
my $status='';
if (&Apache::lonnet::allowed('pch',$ENV{'request.course.id'}.
($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:''))) {
@@ -377,7 +615,11 @@ sub adddiscuss {
'plainname' => $ENV{'environment.firstname'}.' '.
$ENV{'environment.middlename'}.' '.
$ENV{'environment.lastname'}.' '.
- $ENV{'enrironment.generation'});
+ $ENV{'enrironment.generation'},
+ 'attachmenturl'=> $attachmenturl);
+ if ($ENV{'form.replydisc'}) {
+ $contrib{'replyto'}=(split(/\:\:\:/,$ENV{'form.replydisc'}))[1];
+ }
if ($anon) {
$contrib{'anonymous'}='true';
}
@@ -387,7 +629,7 @@ sub adddiscuss {
$ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
$ENV{'course.'.$ENV{'request.course.id'}.'.num'});
my %storenewentry=($symb => time);
- $status.='<br>Updating discussion time: '.
+ $status.='<br />'.&mt('Updating discussion time').': '.
&Apache::lonnet::put('discussiontimes',\%storenewentry,
$ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
$ENV{'course.'.$ENV{'request.course.id'}.'.num'});
@@ -398,13 +640,13 @@ sub adddiscuss {
my %newrecord=();
$newrecord{'resource'}=$symb;
$newrecord{'subnumber'}=$record{'subnumber'}+1;
- $status.='<br>Registering: '.
+ $status.='<br />'.&mt('Registering').': '.
&Apache::lonnet::cstore(\%newrecord,'_discussion');
}
} else {
$status.='Failed.';
}
- return $status.'<br>';
+ return $status.'<br />';
}
# ----------------------------------------------------------- Preview function
@@ -419,18 +661,20 @@ sub show_preview {
}
sub generate_preview_button {
+ my $pre=&mt("Show Preview");
return(<<ENDPREVIEW);
<form name="preview" action="/adm/feedback?preview=1" method="post" target="preview">
<input type="hidden" name="comment" />
-<input type="button" value="Show Preview"
+<input type="button" value="$pre"
onClick="this.form.comment.value=document.mailform.comment.value;this.form.submit();" />
</form>
ENDPREVIEW
}
+
sub handler {
my $r = shift;
if ($r->header_only) {
- $r->content_type('text/html');
+ &Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
return OK;
}
@@ -438,17 +682,17 @@ sub handler {
# --------------------------- Get query string for limited number of parameters
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
- ['hide','unhide','deldisc','postdata','preview']);
+ ['hide','unhide','deldisc','postdata','preview','replydisc','threadedon','threadedoff']);
if (($ENV{'form.hide'}) || ($ENV{'form.unhide'})) {
# ----------------------------------------------------------------- Hide/unhide
- $r->content_type('text/html');
+ &Apache::loncommon::content_type($r,'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 ($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'},
@@ -469,16 +713,30 @@ sub handler {
$ENV{'course.'.$ENV{'request.course.id'}.'.num'});
&redirect_back($r,&Apache::lonnet::clutter($url),
- 'Changed discussion status<p>','0','0');
+ &mt('Changed discussion status').'<br />','0','0');
+ } elsif (($ENV{'form.threadedon'}) || ($ENV{'form.threadedoff'})) {
+ &Apache::loncommon::content_type($r,'text/html');
+ $r->send_http_header;
+ if ($ENV{'form.threadedon'}) {
+ &Apache::lonnet::put('environment',{'threadeddiscussion' => 'on'});
+ &Apache::lonnet::appenv('environment.threadeddiscussion' => 'on');
+ } else {
+ &Apache::lonnet::del('environment',['threadeddiscussion']);
+ &Apache::lonnet::delenv('environment\.threadeddiscussion');
+ }
+ my $symb=$ENV{'form.threadedon'}?$ENV{'form.threadedon'}:$ENV{'form.threadedoff'};
+ my ($map,$ind,$url)=&Apache::lonnet::decode_symb($symb);
+ &redirect_back($r,&Apache::lonnet::clutter($url),
+ &mt('Changed discussion view mode').'<br />','0','0');
} elsif ($ENV{'form.deldisc'}) {
# --------------------------------------------------------------- Hide for good
- $r->content_type('text/html');
+ &Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
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'},
@@ -496,7 +754,7 @@ sub handler {
$ENV{'course.'.$ENV{'request.course.id'}.'.num'});
&redirect_back($r,&Apache::lonnet::clutter($url),
- 'Changed discussion status<p>','0','0');
+ &mt('Changed discussion status').'<br />','0','0');
} elsif ($ENV{'form.preview'}) {
# -------------------------------------------------------- User wants a preview
&show_preview($r);
@@ -506,12 +764,20 @@ sub handler {
$feedurl=~s/^http\:\/\///;
$feedurl=~s/^$ENV{'SERVER_NAME'}//;
$feedurl=~s/^$ENV{'HTTP_HOST'}//;
+ $feedurl=~s/\?.+$//;
- my $symb=&Apache::lonnet::symbread($feedurl);
+ my $symb;
+ if ($ENV{'form.replydisc'}) {
+ $symb=(split(/\:\:\:/,$ENV{'form.replydisc'}))[0];
+ my ($map,$id,$url)=&Apache::lonnet::decode_symb($symb);
+ $feedurl=&Apache::lonnet::clutter($url);
+ } else {
+ $symb=&Apache::lonnet::symbread($feedurl);
+ }
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);
}
}
@@ -519,10 +785,13 @@ sub handler {
if ($feedurl=~/\.(problem|exam|quiz|assess|survey|form)$/) {
unless ($symb) { $goahead=0; }
}
-
+ # backward compatibility (bulltin boards used to be 'wrapped')
+ if ($feedurl=~m|^/adm/wrapper/adm/.*/bulletinboard$|) {
+ $feedurl=~s|^/adm/wrapper||;
+ }
if ($goahead) {
# Go ahead with feedback, no ambiguous reference
- $r->content_type('text/html');
+ &Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
if (
@@ -552,11 +821,19 @@ 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'}) {
+ unless (length($ENV{'form.attachment'})>131072) {
+ $attachmenturl=&Apache::lonnet::userfileupload('attachment');
+ }
+ }
# Filter HTML out of message (could be nasty)
my $message=&clear_out_html($ENV{'form.comment'});
@@ -568,18 +845,19 @@ sub handler {
my ($typestyle,%to) = &decide_receiver($feedurl);
# Actually send mail
- my ($status,$numsent)=&send_msg($feedurl,$email,$citations,%to);
+ my ($status,$numsent)=&send_msg($feedurl,$email,$citations,
+ $attachmenturl,%to);
# Discussion? Store that.
my $numpost=0;
if ($ENV{'form.discuss'}) {
- $typestyle.=&adddiscuss($symb,$message);
+ $typestyle.=&adddiscuss($symb,$message,0,$attachmenturl);
$numpost++;
}
if ($ENV{'form.anondiscuss'}) {
- $typestyle.=&adddiscuss($symb,$message,1);
+ $typestyle.=&adddiscuss($symb,$message,1,$attachmenturl);
$numpost++;
}
@@ -594,7 +872,10 @@ sub handler {
}
} else {
# Ambiguous Problem Resource
- $r->internal_redirect('/adm/ambiguous');
+ if ( &Apache::lonnet::mod_perl_version() == 2 ) {
+ &Apache::lonnet::cleanenv();
+ }
+ $r->internal_redirect('/adm/ambiguous');
}
}
return OK;