--- loncom/interface/lonfeedback.pm 2004/04/28 21:13:13 1.78
+++ loncom/interface/lonfeedback.pm 2004/06/04 22:54:36 1.93
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Feedback
#
-# $Id: lonfeedback.pm,v 1.78 2004/04/28 21:13:13 raeburn Exp $
+# $Id: lonfeedback.pm,v 1.93 2004/06/04 22:54:36 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -34,15 +34,39 @@ use Apache::Constants qw(:common);
use Apache::lonmsg();
use Apache::loncommon();
use Apache::lontexconvert();
-use Apache::lonlocal;
+use Apache::lonlocal; # must not have ()
+use Apache::lonhtmlcommon();
-sub list_discussion {
- my ($mode,$status,$symb)=@_;
-# &Apache::lonnet::logthis("status is $status");
- if (!($status eq 'CAN_ANSWER' || $status eq 'CANNOT_ANSWER'
+sub discussion_open {
+ my ($status)=@_;
+ if (defined($status) &&
+ !($status eq 'CAN_ANSWER' || $status eq 'CANNOT_ANSWER'
|| $status eq 'OPEN')) {
- return '';
+ return 0;
+ }
+ my $close=&Apache::lonnet::EXT('resource.0.discussend');
+ if (defined($close) && $close ne '' && $close < time) {
+ return 0;
}
+ return 1;
+}
+
+sub discussion_visible {
+ my ($status)=@_;
+ if (not &discussion_open($status)) {
+ my $hidden=&Apache::lonnet::EXT('resource.0.discusshide');
+ if (lc($hidden) eq 'yes' or $hidden eq '' or !defined($hidden)) {
+ return 0;
+ }
+ }
+ return 1;
+}
+
+sub list_discussion {
+ my ($mode,$status,$symb)=@_;
+
+ if (not &discussion_visible($status)) { return ''; }
+ my @bgcols = ("#cccccc","#eeeeee");
my $discussiononly=0;
if ($mode eq 'board') { $discussiononly=1; }
unless ($ENV{'request.course.id'}) { return ''; }
@@ -56,28 +80,71 @@ sub list_discussion {
}
unless ($symb) { return ''; }
- my %dischash = &Apache::lonnet::restore($symb,$ENV{'request.course.id'}.'_discuss',$ENV{'user.domain'},$ENV{'user.name'});
- my %readids = ();
- my $showonlyunread;
- foreach my $key (keys %dischash) {
- if ($key eq 'showonlyunread') {
- $showonlyunread = $dischash{$key};
- } else {
- if ($dischash{$key} eq 'read') {
- $readids{$key} = 1;
- }
+# backward compatibility (bulletin boards used to be 'wrapped')
+ my $ressymb=$symb;
+ if ($mode eq 'board') {
+ unless ($ressymb =~ m|bulletin___\d+___adm/wrapper|) {
+ $ressymb=~s|(bulletin___\d+___)|$1adm/wrapper|;
}
}
+# Get discussion display settings for this discussion
+ my $lastkey = $ressymb.'_lastread';
+ my $showkey = $ressymb.'_showonlyunread';
+ my $visitkey = $ressymb.'_visit';
+ my $ondispkey = $ressymb.'_markondisp';
+ my %dischash = &Apache::lonnet::get('nohist_'.$ENV{'request.course.id'}.'_discuss',[$lastkey,$showkey,$visitkey,$ondispkey],$ENV{'user.domain'},$ENV{'user.name'});
+ my %discinfo = ();
+ my $showonlyunread = 0;
+ my $markondisp = 0;
+ my $prevread = 0;
+ my $previous = 0;
+ my $visit = 0;
+ my $newpostsflag = 0;
+
+# Retain identification of "NEW" posts identified in last display, if continuing 'previous' browsing of posts.
+ &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['previous']);
+ $previous = $ENV{'form.previous'};
+ if ($previous > 0) {
+ $prevread = $previous;
+ } elsif (defined($dischash{$lastkey})) {
+ unless ($dischash{$lastkey} eq '') {
+ $prevread = $dischash{$lastkey};
+ }
+ }
+
+# Get discussion display default settings for user
+ my %userenv = &Apache::lonnet::get('environment',['discdisplay','discmarkread'],$ENV{'user.domain'},$ENV{'user.name'});
+ my $discdisplay=$userenv{'discdisplay'};
+ if ($discdisplay eq 'unread') {
+ $showonlyunread = 1;
+ }
+ my $discmarkread=$userenv{'discmarkread'};
+ if ($discmarkread eq 'ondisp') {
+ $markondisp = 1;
+ }
+
+# Override user's default if user specified display setting for this discussion
+ if (defined($dischash{$ondispkey})) {
+ $markondisp = $dischash{$ondispkey};
+ }
+ if ($markondisp) {
+ $discinfo{$lastkey} = time;
+ }
+
+ if (defined($dischash{$showkey})) {
+ $showonlyunread = $dischash{$showkey};
+ }
+
+ if (defined($dischash{$visitkey})) {
+ $visit = $dischash{$visitkey};
+ }
+ $visit ++;
+
my $seeid=&Apache::lonnet::allowed('rin',$crs);
my $viewgrades=(&Apache::lonnet::allowed('vgr',$crs)
&& ($symb=~/\.(problem|exam|quiz|assess|survey|form)$/));
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'});
@@ -87,6 +154,8 @@ sub list_discussion {
my @index=();
my @replies=();
my %alldiscussion=();
+ my %notshown = ();
+ my %newitem = ();
my $maxdepth=0;
my $target='';
@@ -94,9 +163,23 @@ sub list_discussion {
$ENV{'environment.remote'} eq 'off' ) {
$target='target="LONcom"';
}
+
+ my $now = time;
+ $discinfo{$visitkey} = $visit;
+
+ &Apache::lonnet::put('nohist_'.$ENV{'request.course.id'}.'_discuss',\%discinfo,$ENV{'user.domain'},$ENV{'user.name'});
+
if ($contrib{'version'}) {
+ my $oldest = $contrib{'1:timestamp'};
+ if ($prevread eq '0') {
+ $prevread = $oldest-1;
+ }
for (my $id=1;$id<=$contrib{'version'};$id++) {
my $idx=$id;
+ my $posttime = $contrib{$idx.':timestamp'};
+ if ($prevread <= $posttime) {
+ $newpostsflag = 1;
+ }
my $hidden=($contrib{'hidden'}=~/\.$idx\./);
my $deleted=($contrib{'deleted'}=~/\.$idx\./);
my $origindex='0.';
@@ -127,12 +210,13 @@ sub list_discussion {
$subject=&Apache::lontexconvert::msgtexconverted($subject);
}
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>';
+ my ($fname)
+ =($contrib{$idx.':attachmenturl'}=~m|/([^/]+)$|);
+ &Apache::lonnet::allowuploaded('/adm/feedback',
+ $contrib{$idx.':attachmenturl'});
+ $message.='<p>'.&mt('Attachment').
+ ': <a href="'.$contrib{$idx.':attachmenturl'}.'"><tt>'.
+ $fname.'</tt></a></p>';
}
if ($message) {
if ($hidden) {
@@ -160,36 +244,43 @@ sub list_discussion {
if ($seeid) {
if ($hidden) {
$sender.=' <a href="/adm/feedback?unhide='.
- $ressymb.':::'.$idx.'">'.&mt('Make Visible').'</a>';
+ $ressymb.':::'.$idx;
+ if ($newpostsflag) {
+ $sender .= '&previous='.$prevread;
+ }
+ $sender .= '">'.&mt('Make Visible').'</a>';
} else {
$sender.=' <a href="/adm/feedback?hide='.
- $ressymb.':::'.$idx.'">'.&mt('Hide').'</a>';
+ $ressymb.':::'.$idx;
+ if ($newpostsflag) {
+ $sender .= '&previous='.$prevread;
+ }
+ $sender .= '">'.&mt('Hide').'</a>';
}
$sender.=' <a href="/adm/feedback?deldisc='.
- $ressymb.':::'.$idx.'">'.&mt('Delete').'</a>';
+ $ressymb.':::'.$idx;
+ if ($newpostsflag) {
+ $sender .= '&previous='.$prevread;
+ }
+ $sender .= '">'.&mt('Delete').'</a>';
}
} else {
if ($screenname) {
$sender='<i>'.$screenname.'</i>';
}
}
- if (&Apache::lonnet::allowed('pch',
+ if (&discussion_open($status) &&
+ &Apache::lonnet::allowed('pch',
$ENV{'request.course.id'}.
($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:''))) {
$sender.=' <a href="/adm/feedback?replydisc='.
- $ressymb.':::'.$idx.'" '.$target.'>'.&mt('Reply').'</a>';
+ $ressymb.':::'.$idx;
+ if ($newpostsflag) {
+ $sender .= '&previous='.$prevread;
+ }
+ $sender .= '" '.$target.'>'.&mt('Reply').'</a>';
}
my $vgrlink;
- my $ctlink;
- if ($readids{$idx} == 1) {
- $ctlink = '<b>'.&mt('Mark unread').'?</b> '.
- '<input type="checkbox" name="'.
- 'postunread_'.$idx.'" />';
- } else {
- $ctlink = '<b>'.&mt('Mark read').'?</b> '.
- '<input type="checkbox" name="'.
- 'postread_'.$idx.'" />';
- }
if ($viewgrades) {
$vgrlink=&Apache::loncommon::submlink('Submissions',
$contrib{$idx.':sendername'},$contrib{$idx.':senderdomain'},$symb);
@@ -201,62 +292,136 @@ sub list_discussion {
}
$alldiscussion{$thisindex}=$idx;
$index[$idx]=$thisindex;
- $discussionitems[$idx]='<p><table border="0" width="100%">'.
- '<tr><td align="left"><b>'.$subject.'</b> '.
- $sender.'</b> '.$vgrlink.' ('.
- localtime($contrib{$idx.':timestamp'}).
- ')</td><td align="right"> '.$ctlink.'</td></tr>';
- if ($showonlyunread && $readids{$idx}) {
- $discussionitems[$idx] .= '<tr><td colspan="2" align="right"><i><font size="-1">Check "Show all posts?" or "Mark unread?", then "Save read settings" to display message</font></i></td></tr></table>';
+ my $spansize = 2;
+ if ($showonlyunread && $prevread > $posttime) {
+ $notshown{$idx} = 1;
} else {
- $discussionitems[$idx] .= '</table><blockquote>'.$message.'</blockquote></p>';
+ if ($prevread > 0 && $prevread <= $posttime) {
+ $newitem{$idx} = 1;
+ $discussionitems[$idx] .= '
+ <p><table border="0" width="100%">
+ <tr><td align="left"><font color="#FF0000"><b>NEW</b></font></td>';
+ } else {
+ $newitem{$idx} = 0;
+ $discussionitems[$idx] .= '
+ <p><table border="0" width="100%">
+ <tr><td align="left"> </td>';
+ }
+ $discussionitems[$idx] .= '<td align ="left"> '.
+ '<b>'.$subject.'</b> '.
+ $sender.'</b> '.$vgrlink.' ('.
+ localtime($posttime).')</td></tr>'.
+ '</table><blockquote>'.$message.'</blockquote></p>';
}
}
}
}
}
+
my $discussion='';
+
+ my $function = &Apache::loncommon::get_users_function();
+ my $color = &Apache::loncommon::designparm($function.'.tabbg',
+ $ENV{'user.domain'});
+ my %lt = &Apache::lonlocal::texthash(
+ 'cuse' => 'Current settings for this discussion',
+ 'allposts' => 'All posts',
+ 'unread' => 'New posts only',
+ 'ondisp' => 'Once displayed',
+ 'onmark' => 'Once marked read',
+ 'disa' => 'Posts to be displayed',
+ 'npce' => 'Posts cease to be marked "NEW"',
+ 'chgt' => 'Change to ',
+ );
+
+ my $currdisp = $lt{'allposts'};
+ my $currmark = $lt{'onmark'};
+ my $dispchange = $lt{'unread'};
+ my $markchange = $lt{'ondisp'};
+ my $displink = '/adm/feedback?onlyunread='.$ressymb;
+ my $marklink = '/adm/feedback?markondisp='.$ressymb;
+
+ if ($markondisp) {
+ $currmark = $lt{'ondisp'};
+ $markchange = $lt{'onmark'};
+ $marklink = '/adm/feedback?markonread='.$ressymb;
+ if ($newpostsflag) {
+ $marklink .= '&previous='.$prevread;
+ }
+ }
+
+ if ($showonlyunread) {
+ $currdisp = $lt{'unread'};
+ $dispchange = $lt{'allposts'};
+ $displink = '/adm/feedback?allposts='.$ressymb;
+ }
+
+ if ($newpostsflag) {
+ $displink .= '&previous='.$prevread;
+ }
+
if ($visible) {
-# Print a the discusssion
- $discussion .= '<form name="readchoices" method="post" action="/adm/feedback?chgreads='.$symb.'">';
+# Print the discusssion
$discussion.='<table bgcolor="#AAAAAA" cellpadding="2" cellspacing="2" border="0">';
- if ($visible>2) {
- my $colspan=$maxdepth+1;
-my $showoption = '<tr><td align="right" bgcolor="#FFFFFF" colspan="'.$colspan.'">';
- my $showflag = 'all';
- if ($showonlyunread) {
- $showoption .= '<b>Show all posts?</b><input type="checkbox"
-name="allposts" value="1"></td></tr>';
+ my $colspan=$maxdepth+1;
+ $discussion .= '<tr bgcolor="#FFFFFF"><td colspan="'.$colspan.'" valign="top">'.
+ '<table border="0" bgcolor="#FFFFFF" width="100%" cellspacing="2" cellpadding="2">'.
+ '<tr><td align="left"><b>'.$lt{'cuse'}.'</b></td><td> </td><td align="right"><b>'.$lt{'chgt'}.'</b></td></tr>'.
+ '<tr><td>'.$lt{'disa'}.': <i>'.$currdisp.'</i></td><td> </td><td align="right"><a href="'.$displink.'">'.$dispchange.'</a></td></tr>'.
+ '<tr><td>'.$lt{'npce'}.': <i>'.$currmark.'</i></td><td> </td><td align="right"><a href="'.$marklink.'">'.$markchange.'</a></td></tr>'.
+ '</table></td></tr>'.
+ '<tr><td bgcolor="#DDDDBB" colspan="'.$colspan.'">'.
+ '<table border="0" width="100%" bgcolor="#DDDDBB"><tr>';
+ if ($visible>2) {
+ $discussion.='<td align="left">'.
+ '<a href="/adm/feedback?threadedon='.$ressymb;
+ if ($newpostsflag) {
+ $discussion .= '&previous='.$prevread;
+ }
+ $discussion .='">'.&mt('Threaded View').'</a> '.
+ '<a href="/adm/feedback?threadedoff='.$ressymb;
+ if ($newpostsflag) {
+ $discussion .= '&previous='.$prevread;
+ }
+ $discussion .='">'.&mt('Chronological View').'</a> </td>';
+ }
+ if ($newpostsflag) {
+ if (!$markondisp) {
+ $discussion .='<td align="right"><a href="/adm/feedback?markread='.$ressymb.'">'.&mt('Mark new posts as read').'</a> ';
} else {
- $showoption .= '<b>Show only unread posts?</b><input type="checkbox" name="onlyunread" value="1"></td></tr>';
+ $discussion .= '<td> </td>';
}
- $discussion.=$showoption;
- $discussion.='<tr><td bgcolor="DDDDBB" colspan="'.$colspan.'">'.
- '<table border="0" width="100%" bgcolor="#DDDDBB"><tr><td align="left">'.
- '<a href="/adm/feedback?threadedon='.$symb.'">'.&mt('Threaded View').'</a> '.
- '<a href="/adm/feedback?threadedoff='.$symb.'">'.&mt('Chronological View').'</a> </td>'.
- '<td align="right"><a href="/adm/feedback?markread='.$symb.'">'.&mt('Mark all read').'</a> '.
- '<a href="/adm/feedback?markunread='.$symb.'">'.&mt('Mark all unread').'</a> '.
- '</td></tr></table></td></tr>';
- }
+ } else {
+ $discussion .= '<td> </td>';
+ }
+ $discussion .= '</tr></table></td></tr>';
+ my $numhidden = keys %notshown;
+ if ($numhidden > 0) {
+ my $colspan = $maxdepth+1;
+ $discussion.="\n".'<tr><td bgcolor="#CCCCCC" colspan="'.$colspan.'">'.
+ '<a href="/adm/feedback?allposts='.$ressymb;
+ if ($newpostsflag) {
+ $discussion .= '&previous='.$prevread;
+ }
+ $discussion .= '">'.&mt('Show all posts').'</a> '.&mt('to display').' '.
+ $numhidden.' '.&mt('previously viewed posts').
+ '<br/></td></tr>';
+ }
foreach (sort { $a <=> $b } keys %alldiscussion) {
- $discussion.="\n<tr>";
- my $thisdepth=$depth[$alldiscussion{$_}];
- for (1..$thisdepth) {
- $discussion.='<td> </td>';
+ unless ($notshown{$alldiscussion{$_}} eq '1') {
+ $discussion.="\n<tr>";
+ my $thisdepth=$depth[$alldiscussion{$_}];
+ for (1..$thisdepth) {
+ $discussion.='<td> </td>';
+ }
+ my $colspan=$maxdepth-$thisdepth+1;
+ $discussion.='<td bgcolor="'.$bgcols[$newitem{$alldiscussion{$_}}].'" colspan="'.$colspan.'">'.
+ $discussionitems[$alldiscussion{$_}].
+ '</td></tr>';
}
- my $colspan=$maxdepth-$thisdepth+1;
- $discussion.='<td bgcolor="#CCCCCC" colspan="'.$colspan.'">'.
- $discussionitems[$alldiscussion{$_}].
- '</td></tr>';
- }
- my $colspan=$maxdepth+1;
- $discussion.='<tr><td bgcolor="#FFFFFF" align="right" colspan="'.
- $colspan.'"><br /><input type="hidden" name="storereads" value="0">'. '<input type="hidden" name="discsymb" value="'.$symb.'">'.
- '<input type="button" name="readoptions" '.
- 'value="Save read settings" onClick="this.form.storereads.value=1;this.form.submit();"></td></tr>';
- $discussion .= '</table><br /><br /></form>';
+ }
+ $discussion.='</table><br /><br />';
}
if ($discussiononly) {
$discussion.=(<<ENDDISCUSS);
@@ -269,7 +434,7 @@ name="allposts" value="1"></td></tr>';
<font size="1">Note: in anonymous discussion, your name is visible only to
course faculty</font><br />
<b>Title:</b> <input type="text" name="subject" value="" size="30" /><br /><br />
-<textarea name="comment" cols="60" rows="10" wrap="hard"></textarea>
+<textarea name="comment" cols="60" rows="12" wrap="hard"></textarea>
<p>
Attachment (128 KB max size): <input type="file" name="attachment" />
</p>
@@ -277,7 +442,8 @@ Attachment (128 KB max size): <input typ
ENDDISCUSS
$discussion.=&generate_preview_button();
} else {
- if (&Apache::lonnet::allowed('pch',
+ if (&discussion_open($status) &&
+ &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='.
@@ -297,25 +463,33 @@ sub mail_screen {
if (!$title) { $title = $feedurl; }
my $quote='';
my $subject = '';
+ my $prevtag = '';
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\./)) {
+ unless (($contrib{'hidden'}=~/\.$idx\./) || ($contrib{'deleted'}=~/\.$idx\./)) {
my $message=$contrib{$idx.':message'};
$message=~s/\n/\<br \/\>/g;
$quote='<blockquote>'.&Apache::lontexconvert::msgtexconverted($message).'</blockquote>';
- $subject = 'Re: '.$contrib{$idx.':subject'};
+ if ($idx > 0) {
+ $subject = 'Re: '.$contrib{$idx.':subject'};
+ }
+ }
+ if ($ENV{'form.previous'}) {
+ $prevtag = '<input type="hidden" name="previous" value="'.$ENV{'form.previous'}.'" />';
}
}
- my $latexHelp = Apache::loncommon::helpLatexCheatsheet();
+ my $latexHelp=&Apache::loncommon::helpLatexCheatsheet();
+ my $htmlheader=&Apache::lonhtmlcommon::htmlareaheaders();
my $send=&mt('Send');
$r->print(<<ENDDOCUMENT);
<html>
<head>
<title>The LearningOnline Network with CAPA</title>
<meta http-equiv="pragma" content="no-cache"></meta>
+$htmlheader
<script type="text/javascript">
//<!--
function gosubmit() {
@@ -352,6 +526,7 @@ sub mail_screen {
}
if (rec) {
+ document.mailform.onsubmit();
document.mailform.submit();
} else {
alert('Please check a feedback type.');
@@ -364,6 +539,7 @@ $bodytag
<h2><tt>$title</tt></h2>
<form action="/adm/feedback" method="post" name="mailform"
enctype="multipart/form-data">
+$prevtag
<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:
@@ -385,7 +561,9 @@ Attachment (128 KB max size): <input typ
</p>
</form>
ENDDOCUMENT
-$r->print(&generate_preview_button().'</body></html>');
+$r->print(&generate_preview_button().
+&Apache::lonhtmlcommon::htmlareaactive().
+'</body></html>');
}
sub fail_redirect {
@@ -406,14 +584,25 @@ ENDFAILREDIR
}
sub redirect_back {
- my ($r,$feedurl,$typestyle,$sendsomething,$sendposts,$status) = @_;
+ my ($r,$feedurl,$typestyle,$sendsomething,$sendposts,$status,$previous) = @_;
+ my $prevtag = '';
+ my $qrystr = '';
if ($feedurl=~/^\/adm\//) { $feedurl.='?register=1' };
+ if ($previous > 0) {
+ $qrystr = 'previous='.$previous;
+ if ($feedurl =~ /\?register=1/) {
+ $feedurl .= '&'.$qrystr;
+ } else {
+ $feedurl .= '?'.$qrystr;
+ }
+ $prevtag = '<input type="hidden" name="previous" value="'.$previous.'" />';
+ }
$r->print (<<ENDREDIR);
<html>
<head>
<title>Feedback sent</title>
<meta http-equiv="pragma" content="no-cache" />
-<meta HTTP-EQUIV="Refresh" CONTENT="2; url=$feedurl">
+<meta HTTP-EQUIV="Refresh" CONTENT="2; url=$feedurl" />
</head>
<body bgcolor="#FFFFFF" onLoad='if (window.name!="loncapaclient") { this.document.reldt.submit(); self.close(); }'>
<img align="right" src="/adm/lonIcons/lonlogos.gif" />
@@ -421,6 +610,7 @@ $typestyle
<b>Sent $sendsomething message(s), and $sendposts post(s).</b>
<font color="red">$status</font>
<form name="reldt" action="$feedurl" target="loncapaclient">
+$prevtag
</form>
</body>
</html>
@@ -476,7 +666,8 @@ sub screen_header {
}
}
if ($ENV{'request.course.id'}) {
- if (&Apache::lonnet::allowed('pch',
+ if (&discussion_open() &&
+ &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;" '.
@@ -508,14 +699,17 @@ sub resource_output {
sub clear_out_html {
my ($message,$override)=@_;
+ unless (&Apache::lonhtmlcommon::htmlareablocked()) { return $message; }
my $cid=$ENV{'request.course.id'};
if (($ENV{"course.$cid.allow_limited_html_in_feedback"} =~ m/yes/i) ||
($override)) {
# allows <B> <I> <P> <A> <LI> <OL> <UL> <EM> <BR> <TT> <STRONG>
- # <BLOCKQUOTE> <DIV .*> <DIV> <IMG>
+ # <BLOCKQUOTE> <DIV .*> <DIV> <IMG> <M> <SPAN> <H1> <H2> <H3> <H4> <SUB>
+ # <SUP>
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,
- M=>1);
+ M=>1, SUB=>1, SUP=>1, SPAN=>1,
+ H1=>1, H2=>1, H3=>1, H4=>1, H5=>1);
$message =~ s/\<(\/?\s*(\w+)[^\>\<]*)/
{($html{uc($2)}&&(length($1)<1000))?"\<$1":"\<$1"}/ge;
@@ -649,7 +843,8 @@ sub send_msg {
sub adddiscuss {
my ($symb,$email,$anon,$attachmenturl,$subject)=@_;
my $status='';
- if (&Apache::lonnet::allowed('pch',$ENV{'request.course.id'}.
+ if (&discussion_open() &&
+ &Apache::lonnet::allowed('pch',$ENV{'request.course.id'}.
($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:''))) {
my %contrib=('message' => $email,
@@ -716,7 +911,7 @@ sub generate_preview_button {
<input type="hidden" name="subject">
<input type="hidden" name="comment" />
<input type="button" value="$pre"
-onClick="this.form.comment.value=document.mailform.comment.value;this.form.subject.value=document.mailform.subject.value;this.form.submit();" />
+onClick="document.mailform.onsubmit();this.form.comment.value=document.mailform.comment.value;this.form.subject.value=document.mailform.subject.value;this.form.submit();" />
</form>
ENDPREVIEW
}
@@ -732,75 +927,74 @@ sub handler {
# --------------------------- Get query string for limited number of parameters
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
-# ['hide','unhide','deldisc','postdata','preview','replydisc','threadedon','threadedoff']);
- ['hide','unhide','deldisc','postdata','preview','replydisc','threadedon','threadedoff','markread','markunread','storereads','onlyunread','allposts','chgreads']);
+ ['hide','unhide','deldisc','postdata','preview','replydisc','threadedon','threadedoff','onlyunread','allposts','previous','markread','markonread','markondisp']);
+
+ if (($ENV{'form.markondisp'}) || ($ENV{'form.markonread'})) {
+# ---------------------- Modify setting for identification of 'NEW' posts in this discussion
- if (($ENV{'form.markread'}) || ($ENV{'form.markunread'})) {
-# ----------------------------------------------------------------- Modify read/unread for all
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
- my $symb=$ENV{'form.markread'}?$ENV{'form.markread'}:$ENV{'form.markunread'};
+ my $symb=$ENV{'form.markondisp'}?$ENV{'form.markondisp'}:$ENV{'form.markonread'};
my $ressymb = $symb;
my ($map,$ind,$url)=&Apache::lonnet::decode_symb($symb);
- $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 %readinghash = ();
-
- if ($contrib{'version'}) {
- for (my $id=1;$id<=$contrib{'version'};$id++) {
- my $msgid = $id.':message';
- if (defined($contrib{$msgid})) {
- if ($ENV{'form.markread'}) {
- $readinghash{$id} = 'read';
- } else {
- $readinghash{$id} = 'unread';
- }
- }
- }
- if ($ENV{'form.allposts'}) {
- $readinghash{'showonlyunread'} = 0;
- } elsif ($ENV{'form.onlyunread'}) {
- $readinghash{'showonlyunread'} = 1;
+ unless ($ressymb =~ m|bulletin___\d+___adm/wrapper|) {
+ $ressymb=~s|(bulletin___\d+___)|$1adm/wrapper|;
+ }
+
+ my %discinfo = ();
+ my $lastkey = $ressymb.'_lastread';
+ my $ondispkey = $ressymb.'_markondisp';
+ if ($ENV{'form.markondisp'}) {
+ $discinfo{$lastkey} = time;
+ $discinfo{$ondispkey} = 1;
+ } elsif ($ENV{'form.markonread'}) {
+ if ( defined($ENV{'previous'}) ) {
+ $discinfo{$lastkey} = $ENV{'previous'};
}
- &Apache::lonnet::cstore(\%readinghash,$symb,$ENV{'request.course.id'}.'_discuss',$ENV{'user.domain'},$ENV{'user.name'});
+ $discinfo{$ondispkey} = 0;
+ }
+ &Apache::lonnet::put('nohist_'.$ENV{'request.course.id'}.'_discuss',\%discinfo,$ENV{'user.domain'},$ENV{'user.name'});
+ if ($ENV{'form.markondisp'}) {
+ &redirect_back($r,&Apache::lonnet::clutter($url),&mt('Changed display status').'<br />','0','0');
+ } else {
+ &redirect_back($r,&Apache::lonnet::clutter($url),&mt('Changed display status').'<br />','0','0','',$ENV{'form.previous'});
}
-
- &redirect_back($r,&Apache::lonnet::clutter($url),&mt('Changed reading status'),'0','0');
return OK;
- } else {
- my $symb = $ENV{'form.discsymb'};
- my %readinghash = ();
- my $chgcount = 0;
- foreach my $key (keys %ENV) {
- if ($key =~ m/^form\.postunread_(\d+)/) {
- $readinghash{$1} = 'unread';
- $chgcount ++;
- } elsif ($key =~ m/^form\.postread_(\d+)/) {
- $readinghash{$1} = 'read';
- $chgcount ++;
- }
+ } elsif (($ENV{'form.allposts'}) || ($ENV{'form.onlyunread'})) {
+# ----------------------------------------------------------------- Modify display setting for this discussion
+ &Apache::loncommon::content_type($r,'text/html');
+ $r->send_http_header;
+ my $symb=$ENV{'form.allposts'}?$ENV{'form.allposts'}:$ENV{'form.onlyunread'};
+ my $ressymb = $symb;
+ my ($map,$ind,$url)=&Apache::lonnet::decode_symb($symb);
+ unless ($ressymb =~ m|bulletin___\d+___adm/wrapper|) {
+ $ressymb=~s|(bulletin___\d+___)|$1adm/wrapper|;
}
+ my %discinfo = ();
if ($ENV{'form.allposts'}) {
- $readinghash{'showonlyunread'} = 0;
- $chgcount ++;
+ $discinfo{$ressymb.'_showonlyunread'} = 0;
} elsif ($ENV{'form.onlyunread'}) {
- $readinghash{'showonlyunread'} = 1;
- $chgcount ++;
- }
-
- if ($chgcount > 0) {
- &Apache::lonnet::cstore(\%readinghash,$symb,$ENV{'request.course.id'}.'_discuss',$ENV{'user.domain'},$ENV{'user.name'});
+ $discinfo{$ressymb.'_showonlyunread'} = 1;
}
- }
-
- if ($ENV{'form.chgreads'}) {
+ &Apache::lonnet::put('nohist_'.$ENV{'request.course.id'}.'_discuss',\%discinfo,$ENV{'user.domain'},$ENV{'user.name'});
+ &redirect_back($r,&Apache::lonnet::clutter($url),&mt('Changed display status').'<br />','0','0','',$ENV{'form.previous'});
+ return OK;
+ } elsif ($ENV{'form.markread'}) {
+# ----------------------------------------------------------------- Mark new posts as read
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
- my ($map,$ind,$url)=&Apache::lonnet::decode_symb($ENV{'form.chgreads'});
- &redirect_back($r,&Apache::lonnet::clutter($url),
- &mt('Changed read status').'<br />','0','0');
+ my $symb=$ENV{'form.markread'};
+ my $ressymb = $symb;
+ my ($map,$ind,$url)=&Apache::lonnet::decode_symb($symb);
+ unless ($ressymb =~ m|bulletin___\d+___adm/wrapper|) {
+ $ressymb=~s|(bulletin___\d+___)|$1adm/wrapper|;
+ }
+ my %discinfo = ();
+ my $lastkey = $ressymb.'_lastread';
+ $discinfo{$lastkey} = time;
+ &Apache::lonnet::put('nohist_'.$ENV{'request.course.id'}.'_discuss',\%discinfo,$ENV{'user.domain'},$ENV{'user.name'});
+ &redirect_back($r,&Apache::lonnet::clutter($url),&mt('Changed reading status').'<br />','0','0');
+ return OK;
} elsif (($ENV{'form.hide'}) || ($ENV{'form.unhide'})) {
# ----------------------------------------------------------------- Hide/unhide
&Apache::loncommon::content_type($r,'text/html');
@@ -830,7 +1024,7 @@ sub handler {
$ENV{'course.'.$ENV{'request.course.id'}.'.num'});
&redirect_back($r,&Apache::lonnet::clutter($url),
- &mt('Changed read status').'<br />','0','0');
+ &mt('Changed discussion status').'<br />','0','0','',$ENV{'form.previous'});
} elsif (($ENV{'form.threadedon'}) || ($ENV{'form.threadedoff'})) {
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
@@ -844,7 +1038,7 @@ sub handler {
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');
+ &mt('Changed discussion view mode').'<br />','0','0','',$ENV{'form.previous'});
} elsif ($ENV{'form.deldisc'}) {
# --------------------------------------------------------------- Hide for good
&Apache::loncommon::content_type($r,'text/html');
@@ -871,7 +1065,7 @@ sub handler {
$ENV{'course.'.$ENV{'request.course.id'}.'.num'});
&redirect_back($r,&Apache::lonnet::clutter($url),
- &mt('Changed discussion status').'<br />','0','0');
+ &mt('Changed discussion status').'<br />','0','0','',$ENV{'form.previous'});
} elsif ($ENV{'form.preview'}) {
# -------------------------------------------------------- User wants a preview
$r->content_type('text/html');
@@ -950,7 +1144,7 @@ sub handler {
my $attachmenturl='';
if ($ENV{'form.attachment.filename'}) {
unless (length($ENV{'form.attachment'})>131072) {
- $attachmenturl=&Apache::lonnet::userfileupload('attachment');
+ $attachmenturl=&Apache::lonnet::userfileupload('attachment',undef,'feedback');
}
}
# Filter HTML out of message (could be nasty)
@@ -984,7 +1178,7 @@ sub handler {
# Receipt screen and redirect back to where came from
- &redirect_back($r,$feedurl,$typestyle,$numsent,$numpost,$status);
+ &redirect_back($r,$feedurl,$typestyle,$numsent,$numpost,$status,$ENV{'form.previous'});
}
} else {