--- loncom/interface/lonfeedback.pm 2004/07/24 18:19:38 1.106
+++ loncom/interface/lonfeedback.pm 2004/08/01 16:05:14 1.111
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Feedback
#
-# $Id: lonfeedback.pm,v 1.106 2004/07/24 18:19:38 www Exp $
+# $Id: lonfeedback.pm,v 1.111 2004/08/01 16:05:14 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -65,7 +65,6 @@ sub discussion_visible {
sub list_discussion {
my ($mode,$status,$symb)=@_;
-
my $outputtarget=$ENV{'form.grade_target'};
if (not &discussion_visible($status)) { return ''; }
my @bgcols = ("#cccccc","#eeeeee");
@@ -96,12 +95,17 @@ sub list_discussion {
# Get discussion display settings for this discussion
my $lastkey = $ressymb.'_lastread';
my $showkey = $ressymb.'_showonlyunread';
+ my $markkey = $ressymb.'_showonlyunmark',
my $visitkey = $ressymb.'_visit';
my $ondispkey = $ressymb.'_markondisp';
my $userpickkey = $ressymb.'_userpick';
- my %dischash = &Apache::lonnet::get('nohist_'.$ENV{'request.course.id'}.'_discuss',[$lastkey,$showkey,$visitkey,$ondispkey,$userpickkey],$ENV{'user.domain'},$ENV{'user.name'});
+ my $toggkey = $ressymb.'_readtoggle';
+ my $readkey = $ressymb.'_read';
+
+ my %dischash = &Apache::lonnet::get('nohist_'.$ENV{'request.course.id'}.'_discuss',[$lastkey,$showkey,$markkey,$visitkey,$ondispkey,$userpickkey,$toggkey,$readkey],$ENV{'user.domain'},$ENV{'user.name'});
my %discinfo = ();
my $showonlyunread = 0;
+ my $showunmark = 0;
my $markondisp = 0;
my $prevread = 0;
my $previous = 0;
@@ -125,7 +129,7 @@ sub list_discussion {
}
}
-# Get information about students and non-stundents in course for filtering display of posts
+# Get information about students and non-students in course for filtering display of posts
my %roleshash = ();
my %roleinfo = ();
if ($rolefilter) {
@@ -176,6 +180,10 @@ sub list_discussion {
$showonlyunread = $dischash{$showkey};
}
+ if (defined($dischash{$markkey})) {
+ $showunmark = $dischash{$markkey};
+ }
+
if (defined($dischash{$visitkey})) {
$visit = $dischash{$visitkey};
}
@@ -205,7 +213,7 @@ sub list_discussion {
$ENV{'environment.remote'} eq 'off' ) {
$target='target="LONcom"';
}
-
+
my $now = time;
$discinfo{$visitkey} = $visit;
@@ -258,22 +266,36 @@ sub list_discussion {
$numoldver = 1;
}
}
- my $message=$contrib{$idx.':message'};
+ my ($message,$subject);
+ if ($idx > 0) {
+ if ($contrib{$idx.':message'} =~ /.*::::\Q$numoldver\E::::(.+?)$/si) {
+ $message = $1;
+ } else {
+ $message = $contrib{$idx.':message'};
+ }
+ } else {
+ $message=$contrib{$idx.':message'};
+ }
+ my $attachmenturls = $contrib{$idx.':attachmenturl'};
$message=~s/\n/\<br \/\>/g;
- $message=&Apache::lontexconvert::msgtexconverted($message,undef,$numoldver);
- my $subject=$contrib{$idx.':subject'};
+ $message=&Apache::lontexconvert::msgtexconverted($message);
+ if ($idx > 0) {
+ if ($contrib{$idx.':subject'} =~ /.*::::\Q$numoldver\E::::(.+?)$/si) {
+ $subject = $1;
+ } else {
+ $subject = $contrib{$idx.':subject'};
+ }
+ } else {
+ $subject=$contrib{$idx.':subject'};
+ }
if (defined($subject)) {
$subject=~s/\n/\<br \/\>/g;
- $subject=&Apache::lontexconvert::msgtexconverted($subject,undef,$numoldver);
+ $subject=&Apache::lontexconvert::msgtexconverted($subject);
}
- if ($contrib{$idx.':attachmenturl'}) {
- 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 ($attachmenturls) {
+ my @attachments = ();
+ my %currattach = ();
+ &extract_attachments($attachmenturls,$idx,$numoldver,\$message,\@attachments,\%currattach);
}
if ($message) {
if ($hidden) {
@@ -420,6 +442,12 @@ sub list_discussion {
$vgrlink=&Apache::loncommon::submlink('Submissions',
$contrib{$idx.':sendername'},$contrib{$idx.':senderdomain'},$symb);
}
+ my $ctlink;
+ if ($dischash{$readkey}=~/\.$idx\./) {
+ $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.'" />';
+ }
#figure out at what position this needs to print
my $thisindex=$idx;
if ( (($ENV{'environment.threadeddiscussion'}) && (($sortposts eq '') || ($sortposts eq 'ascdate'))) || ($sortposts eq 'thread')) {
@@ -431,7 +459,10 @@ sub list_discussion {
my $spansize = 2;
if ($showonlyunread && $prevread > $posttime) {
$notshown{$idx} = 1;
+ } elsif ($showunmark && $dischash{$readkey}=~/\.$idx\./) {
+ $notshown{$idx} = 1;
} else {
+# apply filters
my $uname = $contrib{$idx.':sendername'};
my $udom = $contrib{$idx.':senderdomain'};
my $poster = $uname.':'.$udom;
@@ -493,11 +524,19 @@ sub list_discussion {
$discussionitems[$idx] .= '<td align ="left"> '.
'<b>'.$subject.'</b> '.
$sender.'</b> '.$vgrlink.' ('.
- localtime($posttime).')</td></tr>'.
- '</table><blockquote>'.$message.'</blockquote></p>';
+ &Apache::lonlocal::locallocaltime($posttime).')</td>';
+ if ($dischash{$toggkey}) {
+ $discussionitems[$idx].='<td align="right"> '.
+ $ctlink.'</td>';
+ }
+ $discussionitems[$idx].= '</tr></table><blockquote>'.$message.'</blockquote></p>';
if ($contrib{$idx.':history'}) {
my @postversions = ();
- $discussionitems[$idx] .= '<br />'.&mt('This post has been edited by the author.').'<br/>'.&mt('Earlier version(s) were posted on: ');
+ $discussionitems[$idx] .= '<br />'.&mt('This post has been edited by the author.');
+ if ($seeid) {
+ $discussionitems[$idx] .= ' <a href="/adm/feedback?allversions='.$ressymb.':::'.$idx.'">'.&mt('Display all versions').'</a>';
+ }
+ $discussionitems[$idx].='<br/>'.&mt('Earlier version(s) were posted on: ');
if ($contrib{$idx.':history'} =~ m/:/) {
@postversions = split/:/,$contrib{$idx.':history'};
} else {
@@ -507,7 +546,6 @@ sub list_discussion {
my $version = $i+1;
$discussionitems[$idx] .= '<b>'.$version.'.</b> - '.&Apache::lonlocal::locallocaltime($postversions[$i]).' ';
}
- $discussionitems[$idx] .= '<br />';
}
}
}
@@ -524,22 +562,31 @@ sub list_discussion {
'cuse' => 'Current discussion settings',
'allposts' => 'All posts',
'unread' => 'New posts only',
+ 'unmark' => 'Unread only',
'ondisp' => 'Once displayed',
- 'onmark' => 'Once marked read',
+ 'onmark' => 'Once marked not NEW',
+ 'toggoff' => 'Off',
+ 'toggon' => 'On',
'disa' => 'Posts to be displayed',
'npce' => 'Posts cease to be marked "NEW"',
+ 'epcb' => 'Each post can be toggled read/unread',
'chgt' => 'Change',
'disp' => 'Display',
'nolo' => 'Not new',
+ 'togg' => 'Toggle read/unread',
);
my $currdisp = $lt{'allposts'};
my $currmark = $lt{'onmark'};
+ my $currtogg = $lt{'toggoff'};
my $dispchange = $lt{'unread'};
my $markchange = $lt{'ondisp'};
+ my $toggchange = $lt{'toggon'};
my $chglink = '/adm/feedback?modifydisp='.$ressymb;
- my $displink = 'onlyunread';
+ my $displinkA = 'onlyunread';
+ my $displinkB = 'onlyunmark';
my $marklink = 'markondisp';
+ my $togglink = 'toggon';
if ($markondisp) {
$currmark = $lt{'ondisp'};
@@ -550,10 +597,24 @@ sub list_discussion {
if ($showonlyunread) {
$currdisp = $lt{'unread'};
$dispchange = $lt{'allposts'};
- $displink = 'allposts';
+ $displinkA = 'allposts';
}
+
+ if ($showunmark) {
+ $currdisp = $lt{'unmark'};
+ $dispchange = $lt{'unmark'};
+ $displinkA='allposts';
+ $displinkB='onlyunread';
+ $showonlyunread = 0;
+ }
+
+ if ($dischash{$toggkey}) {
+ $currtogg = $lt{'toggon'};
+ $toggchange = $lt{'toggoff'};
+ $togglink = 'toggoff';
+ }
- $chglink .= '&changes='.$displink.'_'.$marklink;
+ $chglink .= '&changes='.$displinkA.'_'.$displinkB.'_'.$marklink.'_'.$togglink;
if ($newpostsflag) {
$chglink .= '&previous='.$prevread;
@@ -577,7 +638,7 @@ sub list_discussion {
}
</script>
|;
- $discussion.='<table bgcolor="#AAAAAA" cellpadding="2" cellspacing="2" border="0">';
+ $discussion.='<form name="readchoices" method="post" action="/adm/feedback?chgreads='.$symb.'"><table bgcolor="#AAAAAA" cellpadding="2" cellspacing="2" border="0">';
$discussion .='<tr><td bgcolor="#DDDDBB" colspan="'.$colspan.'">'.
'<table border="0" width="100%" bgcolor="#DDDDBB"><tr>';
if ($visible>2) {
@@ -607,7 +668,7 @@ sub list_discussion {
$discussion .= '">'.&mt('Export').'?</a> </td>';
if ($newpostsflag) {
if (!$markondisp) {
- $discussion .='<td align="right"><a href="/adm/feedback?markread='.$ressymb.'">'.&mt('Mark new posts as read').'</a> ';
+ $discussion .='<td align="right"><a href="/adm/feedback?markread='.$ressymb.'">'.&mt('Mark NEW posts no longer new').'</a> ';
} else {
$discussion .= '<td> </td>';
}
@@ -631,8 +692,13 @@ sub list_discussion {
$discussion .= '&previous='.$prevread;
}
$discussion .= '">'.&mt('Show all posts').'</a> '.&mt('to display').' '.
- $numhidden.' '.&mt('previously viewed posts').
- '<br/></td></tr>';
+ $numhidden.' ';
+ if ($showunmark) {
+ $discussion .= &mt('posts previously marked read');
+ } else {
+ $discussion .= &mt('previously viewed posts');
+ }
+ $discussion .= '<br/></td></tr>';
}
# Choose sort mechanism
@@ -705,7 +771,7 @@ sub list_discussion {
}
if ($outputtarget ne 'tex') {
my $colspan=$maxdepth+1;
- $discussion .= <<END;
+ $discussion .= <<END;
<tr bgcolor="#FFFFFF">
<td colspan="$colspan" valign="top">
<table border="0" bgcolor="#FFFFFF" width="100%" cellspacing="2" cellpadding="2">
@@ -716,48 +782,105 @@ sub list_discussion {
<td>
<font size="-1"><b>$lt{'cuse'}</b>:</td>
<td> </td>
+ <td><font size="-1">
END
if ($newpostsflag) {
$discussion .=
- '<td><font size="-1">1. '.$lt{'disp'}.' - <i>'.$currdisp.'</i> 2. '.$lt{'nolo'}.' - <i>'.$currmark.'</i></font></td>';
+ '1. '.$lt{'disp'}.' - <i>'.$currdisp.'</i> 2. '.$lt{'nolo'}.' - <i>'.$currmark.'</i>';
+ if ($dischash{$toggkey}) {
+ $discussion .= ' 3. '.$lt{'togg'}.' - <i>'.$currtogg.'</i>';
+ }
} else {
- $discussion .=
- '<td><font size="-1">'.$lt{'disp'}.' - <i>'.$currdisp.'</i></font></td>';
+ if ($dischash{$toggkey}) {
+ $discussion .= '1. '.$lt{'disp'}.' - <i>'.$currdisp.'</i> 2. '.$lt{'togg'}.' - <i>'.$currtogg.'</i>';
+ } else {
+ $discussion .=
+ $lt{'disp'}.' - <i>'.$currdisp.'</i>';
+ }
}
$discussion .= <<END;
+ </font></td>
<td> </td>
<td>
- <font size="-1"><b><a href="$chglink">$lt{'chgt'}</a>?</font></b></td>
+ <font size="-1"><b><a href="$chglink">$lt{'chgt'}</a>?</font></b>
+ </td>
</tr>
</table>
</td>
+END
+ if ($dischash{$toggkey}) {
+ my $storebutton = &mt('Store read/unread changes');
+ $discussion.='<td align="right">'.
+ '<input type="hidden" name="discsymb" value="'.$ressymb.'">'."\n".
+ '<input type="button" name="readoptions" value="'.$storebutton.'"'.
+ ' onClick="this.form.submit();">'."\n".
+ '</td>';
+ }
+ $discussion .= (<<END);
</tr>
</table>
</td>
</tr>
</table>
- <br /><br />
+ <br /><br /></form>
END
}
}
if ($discussiononly) {
+ my $now = time;
+ my $attachnum = 0;
+ my $newattachmsg = '';
+ my @currnewattach = ();
+ my @currdelold = ();
+ my $comment = '';
+ my $subject = '';
+ if ($ENV{'form.origpage'}) {
+ &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['addnewattach','deloldattach','delnewattach','timestamp','idx','subject','comment']);
+ $subject = &HTML::Entities::encode($ENV{'form.subject'},'<>&"');
+ $comment = &HTML::Entities::encode($ENV{'form.comment'},'<>&"');
+ my @keepold = ();
+ &process_attachments(\@currnewattach,\@currdelold,\@keepold);
+ if (@currnewattach > 0) {
+ $attachnum += @currnewattach;
+ }
+ }
$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 />
-<b>Title:</b> <input type="text" name="subject" value="" size="30" /><br /><br />
-<textarea name="comment" cols="80" rows="14" wrap="hard"></textarea>
-<p>
-Attachment (128 KB max size): <input type="file" name="attachment" />
-</p>
-</form>
+<input type="hidden" name="timestamp" value="$now" />
+<br /><a name="newpost"></a>
+<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="$subject" size="30" /><br /><br />
+<textarea name="comment" cols="80" rows="14" wrap="hard">$comment</textarea>
ENDDISCUSS
+ if ($ENV{'form.origpage'}) {
+ $discussion.='<input type="hidden" name="origpage" value="'.$ENV{'form.origpage'}.'" />'."\n";
+ foreach (@currnewattach) {
+ $discussion.='<input type="hidden" name="currnewattach" value="'.$_.'" />'."\n";
+ }
+ }
+ $discussion.="</form>\n";
if ($outputtarget ne 'tex') {
+ $discussion.=&generate_attachments_button('',$attachnum,$ressymb,$now,\@currnewattach,\@currdelold,'',$mode);
+ if (@currnewattach > 0) {
+ $newattachmsg .= '<b>New attachments</b><br />';
+ if (@currnewattach > 1) {
+ $newattachmsg .= '<ol>';
+ foreach my $item (@currnewattach) {
+ $item =~ m#.*/([^/]+)$#;
+ $newattachmsg .= '<li><a href="'.$item.'">'.$1.'</a></li>'."\n";
+ }
+ $newattachmsg .= '</ol>'."\n";
+ } else {
+ $currnewattach[0] =~ m#.*/([^/]+)$#;
+ $newattachmsg .= '<a href="'.$currnewattach[0].'">'.$1.'</a><br />'."\n";
+ }
+ }
+ $discussion.=$newattachmsg;
$discussion.=&generate_preview_button();
}
} else {
@@ -778,22 +901,62 @@ ENDDISCUSS
sub mail_screen {
my ($r,$feedurl,$options) = @_;
+ if (exists($ENV{'form.origpage'})) {
+ &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['subject','comment','currnewattach','addnewattach','deloldattach','delnewattach','timestamp','idx','anondiscuss','discuss']);
+ }
my $bodytag=&Apache::loncommon::bodytag('Resource Feedback and Discussion',
'','onLoad="window.focus();setposttype();"');
my $title=&Apache::lonnet::gettitle($feedurl);
if (!$title) { $title = $feedurl; }
my $quote='';
my $subject = '';
- my $oldmessage = '';
+ my $comment = '';
my $prevtag = '';
my $parentmsg = '';
- my $anonscript = (<<END);
+ my ($symb,$idx,$attachmenturls);
+ my $numoldver = 0;
+ my $attachmsg = '';
+ my $newattachmsg = '';
+ my @currnewattach = ();
+ my @currdelold = ();
+ my @keepold = ();
+ my @attachments = ();
+ my %currattach = ();
+ my $attachnum = 0;
+ my $anonchk = (<<END);
+ function anonchk() {
+ if (document.mailform.anondiscuss.checked == true) {
+ document.attachment.anondiscuss.value = '1'
+ }
+ if (document.mailform.discuss.checked == true) {
+ document.attachment.discuss.value = '1'
+ }
+ return
+ }
+END
+ my $anonscript;
+ if (exists($ENV{'form.origpage'})) {
+ $anonscript = (<<END);
function setposttype() {
+ var anondisc = $ENV{'form.anondiscuss'};
+ var disc = $ENV{'form.discuss'};
+ if (anondisc == 1) {
+ document.mailform.anondiscuss.checked = true
+ }
+ if (disc == 1) {
+ document.mailform.discuss.checked = true
+ }
return
}
END
+ } else {
+ $anonscript = (<<END);
+ function setposttype() {
+ return
+ }
+END
+ }
if (($ENV{'form.replydisc'}) || ($ENV{'form.editdisc'})) {
- my ($symb,$idx);
if ($ENV{'form.replydisc'}) {
($symb,$idx)=split(/\:\:\:/,$ENV{'form.replydisc'});
} else {
@@ -804,7 +967,6 @@ END
$ENV{'course.'.$ENV{'request.course.id'}.'.num'});
unless (($contrib{'hidden'}=~/\.$idx\./) || ($contrib{'deleted'}=~/\.$idx\./)) {
if ($ENV{'form.replydisc'}) {
- my $numoldver = 0;
if ($contrib{$idx.':history'}) {
if ($contrib{$idx.':history'} =~ /:/) {
my @oldversions = split/:/,$contrib{$idx.':history'};
@@ -813,37 +975,51 @@ END
$numoldver = 1;
}
}
- my $message=$contrib{$idx.':message'};
+ my $message;
+ if ($idx > 0) {
+ if ($contrib{$idx.':message'} =~ /::::\Q$numoldver\E::::(.+?)$/si) {
+ $message = $1;
+ } else {
+ $message = $contrib{$idx.':message'};
+ }
+ } else {
+ $message=$contrib{$idx.':message'};
+ }
$message=~s/\n/\<br \/\>/g;
- $quote='<blockquote>'.&Apache::lontexconvert::msgtexconverted($message,undef,$numoldver).'</blockquote>';
+ $quote='<blockquote>'.&Apache::lontexconvert::msgtexconverted($message).'</blockquote>';
if ($idx > 0) {
- if ($contrib{'subject'} =~ /::::\d+::::(.+)$/si) {
+ if ($contrib{$idx.':subject'} =~ /::::\Q$numoldver\E::::(.+?)$/si) {
$subject = $1;
} else {
$subject = $contrib{$idx.':subject'};
}
$subject = 'Re: '.$subject;
}
+ $subject = &HTML::Entities::encode($subject,'<>&"');
} else {
- if ($contrib{$idx.':message'} =~ /::::\d+::::(.+)$/si) {
- $oldmessage = $1;
+ $attachmenturls = $contrib{$idx.':attachmenturl'};
+ if ($contrib{$idx.':message'} =~ /.*::::(\d+)::::(.*?)$/si) {
+ $numoldver = $1;
+ $comment = $2;
} else {
- $oldmessage = $contrib{$idx.':message'};
+ $comment = $contrib{$idx.':message'};
}
- $oldmessage=&HTML::Entities::encode($oldmessage,'<>&"');
- if ($contrib{$idx.':subject'} =~ /::::\d+::::(.+)$/si) {
+ $comment = &HTML::Entities::encode($comment,'<>&"');
+ if ($contrib{$idx.':subject'} =~ /.*::::\d+::::(.+?)$/si) {
$subject = $1;
} else {
$subject = $contrib{$idx.':subject'};
}
+ $subject = &HTML::Entities::encode($subject,'<>&"');
if (defined($contrib{$idx.':replyto'})) {
$parentmsg = $contrib{$idx.':replyto'};
}
- my $anonflag = 0;
- if ($contrib{$idx.':anonymous'}) {
- $anonflag = 1;
- }
- $anonscript = (<<END);
+ unless (exists($ENV{'form.origpage'})) {
+ my $anonflag = 0;
+ if ($contrib{$idx.':anonymous'}) {
+ $anonflag = 1;
+ }
+ $anonscript = (<<END);
function setposttype () {
var currtype = $anonflag
if (currtype == 1) {
@@ -857,12 +1033,19 @@ END
return
}
END
+ }
}
}
if ($ENV{'form.previous'}) {
$prevtag = '<input type="hidden" name="previous" value="'.$ENV{'form.previous'}.'" />';
}
}
+
+ if ($ENV{'form.origpage'}) {
+ $subject = $ENV{'form.subject'};
+ $comment = $ENV{'form.comment'};
+ &process_attachments(\@currnewattach,\@currdelold,\@keepold);
+ }
my $latexHelp=&Apache::loncommon::helpLatexCheatsheet();
my $htmlheader=&Apache::lonhtmlcommon::htmlareaheaders();
my $send=&mt('Send');
@@ -916,6 +1099,7 @@ $htmlheader
alert('Please check a feedback type.');
}
}
+ $anonchk
$anonscript
//-->
</script>
@@ -937,7 +1121,7 @@ END
<input type="hidden" name="parentmsg" value ="$parentmsg" />
END
}
- $r->print(<<ENDDOCUMENT);
+ $r->print(<<END);
Please check at least one of the following feedback types:
$options<hr />
$quote
@@ -946,24 +1130,82 @@ $quote
$latexHelp
Title: <input type="text" name="subject" size="30" value="$subject" /></p>
<p>
-<textarea name="comment" id="comment" cols="60" rows="10" wrap="hard">$oldmessage
+<textarea name="comment" id="comment" cols="60" rows="10" wrap="hard">$comment
</textarea></p>
<p>
+END
+ if ( ($ENV{'form.editdisc'}) || ($ENV{'form.replydisc'}) ) {
+ if ($ENV{'form.origpage'}) {
+ foreach (@currnewattach) {
+ $r->print('<input type="hidden" name="currnewattach" value="'.$_.'" />'."\n");
+ }
+ foreach (@currdelold) {
+ $r->print('<input type="hidden" name="deloldattach" value="'.$_.'" />'."\n");
+ }
+ }
+ if ($ENV{'form.editdisc'}) {
+ if ($attachmenturls) {
+ &extract_attachments($attachmenturls,$idx,$numoldver,\$attachmsg,\@attachments,\%currattach,\@currdelold);
+ $attachnum = scalar(keys %currattach);
+ foreach (keys %currattach) {
+ $r->print('<input type="hidden" name="keepold" value="'.$_.'" />'."\n");
+ }
+ }
+ }
+ } else {
+ $r->print(<<END);
Attachment (128 KB max size): <input type="file" name="attachment" />
</p>
+END
+ }
+ $r->print(<<END);
<p>
<input type="hidden" name="sendit" value="1" />
<input type="button" value="$send" onClick='gosubmit();' />
</p>
</form>
-ENDDOCUMENT
-$r->print(&generate_preview_button().
-&Apache::lonhtmlcommon::htmlareaselectactive('comment').
-'</body></html>');
+END
+ if ($ENV{'form.editdisc'} || $ENV{'form.replydisc'}) {
+ my $now = time;
+ my $ressymb = $symb;
+ my $postidx = '';
+ if ($ENV{'form.editdisc'}) {
+ $postidx = $idx;
+ }
+ if (@currnewattach > 0) {
+ $attachnum += @currnewattach;
+ }
+ $r->print(&generate_attachments_button($postidx,$attachnum,$ressymb,$now,\@currnewattach,\@currdelold,$numoldver));
+ if ($attachnum > 0) {
+ if (@currnewattach > 0) {
+ $newattachmsg .= '<b>New attachments</b><br />';
+ if (@currnewattach > 1) {
+ $newattachmsg .= '<ol>';
+ foreach my $item (@currnewattach) {
+ $item =~ m#.*/([^/]+)$#;
+ $newattachmsg .= '<li><a href="'.$item.'">'.$1.'</a></li>'."\n";
+ }
+ $newattachmsg .= '</ol>'."\n";
+ } else {
+ $currnewattach[0] =~ m#.*/([^/]+)$#;
+ $newattachmsg .= '<a href="'.$currnewattach[0].'">'.$1.'</a><br />'."\n";
+ }
+ }
+ if ($attachmsg) {
+ $r->print("<b>Retained attachments</b>:$attachmsg<br />\n");
+ }
+ if ($newattachmsg) {
+ $r->print("$newattachmsg<br />");
+ }
+ }
+ }
+ $r->print(&generate_preview_button().
+ &Apache::lonhtmlcommon::htmlareaselectactive('comment').
+ '</body></html>');
}
sub print_display_options {
- my ($r,$symb,$previous,$dispchg,$markchg,$feedurl) = @_;
+ my ($r,$symb,$previous,$dispchgA,$dispchgB,$markchg,$toggchg,$feedurl) = @_;
# backward compatibility (bulletin boards used to be 'wrapped')
if ($feedurl=~m|^/adm/wrapper/adm/.*/bulletinboard$|) {
$feedurl=~s|^/adm/wrapper||;
@@ -983,54 +1225,116 @@ sub print_display_options {
'deff' => 'Default for all discussions',
'prca' => 'Preferences can be set for this discussion that determine ....',
'whpo' => 'Which posts are displayed when you display this bulletin board or resource, and',
- 'unwh' => 'Under what circumstances posts are identfied as "New."',
+ 'unwh' => 'Under what circumstances posts are identified as "NEW", and',
+ 'wipa' => 'Whether individual posts can be marked as read/unread',
'allposts' => 'All posts',
'unread' => 'New posts only',
+ 'unmark' => 'Posts not marked read',
'ondisp' => 'Once displayed',
- 'onmark' => 'Once marked as read',
+ 'onmark' => 'Once marked not NEW ',
+ 'toggon' => 'Shown',
+ 'toggoff' => 'Not shown',
'disa' => 'Posts displayed?',
- 'npmr' => 'New posts cease to be identified as "New"?',
+ 'npmr' => 'New posts cease to be identified as "NEW"?',
+ 'dotm' => 'Option to mark each post as read/unread?',
'chgt' => 'Change to ',
'mkdf' => 'Set to ',
- 'yhni' => 'You have not indicated that you wish to change either of the discussion settings',
+ 'yhni' => 'You have not indicated that you wish to change any of the discussion settings',
'ywbr' => 'You will be returned to the previous page if you click OK.'
);
- my $dispchange = $lt{'unread'};
+ my $dispchangeA = $lt{'unread'};
+ my $dispchangeB = $lt{'unmark'};
my $markchange = $lt{'ondisp'};
+ my $toggchange = $lt{'toggon'};
my $currdisp = $lt{'allposts'};
my $currmark = $lt{'onmark'};
my $discdisp = 'allposts';
my $discmark = 'onmark';
+ my $currtogg = $lt{'toggoff'};
+ my $disctogg = 'toggoff';
- if ($dispchg eq 'allposts') {
- $dispchange = $lt{'allposts'};
+ if ($dispchgA eq 'allposts') {
+ $dispchangeA = $lt{'allposts'};
$currdisp = $lt{'unread'};
$discdisp = 'unread';
}
-
+
if ($markchg eq 'markonread') {
$markchange = $lt{'onmark'};
$currmark = $lt{'ondisp'};
$discmark = 'ondisp';
}
+
+ if ($dispchgB eq 'onlyunread') {
+ $dispchangeB = $lt{'unread'};
+ $currdisp = $lt{'unmark'};
+ $discdisp = 'unmark';
+ }
+ if ($toggchg eq 'toggoff') {
+ $toggchange = $lt{'toggoff'};
+ $currtogg = $lt{'toggon'};
+ $disctogg = 'toggon';
+ }
$r->print(<<END);
<html>
<head>
<title>$lt{'dido'}</title>
<meta http-equiv="pragma" content="no-cache" />
<script>
+function discdispChk(caller) {
+ var disctogg = '$toggchg'
+ if (caller == 0) {
+ if (document.modifydisp.discdisp[0].checked == true) {
+ if (document.modifydisp.discdisp[1].checked == true) {
+ document.modifydisp.discdisp[1].checked = false
+ }
+ }
+ }
+ if (caller == 1) {
+ if (document.modifydisp.discdisp[1].checked == true) {
+ if (document.modifydisp.discdisp[0].checked == true) {
+ document.modifydisp.discdisp[0].checked = false
+ }
+ if (disctogg == 'toggon') {
+ document.modifydisp.disctogg.checked = true
+ }
+ if (disctogg == 'toggoff') {
+ document.modifydisp.disctogg.checked = false
+ }
+ }
+ }
+ if (caller == 2) {
+ var dispchgB = '$dispchgB'
+ if (disctogg == 'toggoff') {
+ if (document.modifydisp.disctogg.checked == true) {
+ if (dispchgB == 'onlyunmark') {
+ document.modifydisp.discdisp[1].checked = false
+ }
+ }
+ }
+ }
+}
+
function setDisp() {
var prev = "$previous"
var chktotal = 0
- if (document.modifydisp.discdisp.checked == true) {
- document.modifydisp.$dispchg.value = "$symb"
+ if (document.modifydisp.discdisp[0].checked == true) {
+ document.modifydisp.$dispchgA.value = "$symb"
+ chktotal ++
+ }
+ if (document.modifydisp.discdisp[1].checked == true) {
+ document.modifydisp.$dispchgB.value = "$symb"
chktotal ++
}
if (document.modifydisp.discmark.checked == true) {
document.modifydisp.$markchg.value = "$symb"
chktotal ++
}
+ if (document.modifydisp.disctogg.checked == true) {
+ document.modifydisp.$toggchg.value = "$symb"
+ chktotal ++
+ }
if (chktotal > 0) {
document.modifydisp.submit()
} else {
@@ -1047,7 +1351,7 @@ function setDisp() {
</head>
$bodytag
<form name="modifydisp" method="post" action="/adm/feedback">
-$lt{'sdpf'}<br/> $lt{'prca'} <ol><li>$lt{'whpo'}</li><li>$lt{'unwh'}</li></ol>
+$lt{'sdpf'}<br/> $lt{'prca'} <ol><li>$lt{'whpo'}</li><li>$lt{'unwh'}</li><li>$lt{'wipa'}</li></ol>
<br />
<table border="0" cellpadding="0" cellspacing="0">
<tr>
@@ -1064,11 +1368,18 @@ $lt{'sdpf'}<br/> $lt{'prca'} <ol><li>$l
<tr bgcolor="#dddddd">
<td>$lt{'disa'}</td>
<td>$lt{$discdisp}</td>
- <td><input type="checkbox" name="discdisp" /> $lt{'chgt'} "$dispchange"</td>
+ <td><input type="checkbox" name="discdisp" onClick="discdispChk('0')" /> $lt{'chgt'} "$dispchangeA"
+ <br />
+ <input type="checkbox" name="discdisp" onClick="discdispChk('1')" /> $lt{'chgt'} "$dispchangeB"
+ </td>
</tr><tr bgcolor="#eeeeee">
<td>$lt{'npmr'}</td>
<td>$lt{$discmark}</td>
<td><input type="checkbox" name="discmark" />$lt{'chgt'} "$markchange"</td>
+ </tr><tr bgcolor="#dddddd">
+ <td>$lt{'dotm'}</td>
+ <td>$lt{$disctogg}</td>
+ <td><input type="checkbox" name="disctogg" onClick="discdispChk('2')" />$lt{'chgt'} "$toggchange"</td>
</tr>
</table>
</td>
@@ -1080,8 +1391,10 @@ $lt{'sdpf'}<br/> $lt{'prca'} <ol><li>$l
<br />
<br />
<input type="hidden" name="previous" value="$previous" />
-<input type="hidden" name="$dispchg" value=""/>
+<input type="hidden" name="$dispchgA" value=""/>
+<input type="hidden" name="$dispchgB" value=""/>
<input type="hidden" name="$markchg" value=""/>
+<input type="hidden" name="$toggchg" value="" />
<input type="button" name="sub" value="Store Changes" onClick="javascript:setDisp()" />
<br />
<br />
@@ -1428,6 +1741,7 @@ ENDREDIR
sub no_redirect_back {
my ($r,$feedurl) = @_;
+ my $nofeed=&mt('Sorry, no feedback possible on this resource ...');
$r->print (<<ENDNOREDIR);
<html>
<head><title>Feedback not sent</title>
@@ -1442,7 +1756,7 @@ ENDNOREDIR
</head>
<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>
+<b>$nofeed</b>
</body>
</html>
ENDNOREDIRTWO
@@ -1509,25 +1823,25 @@ sub resource_output {
sub clear_out_html {
my ($message,$override)=@_;
unless (&Apache::lonhtmlcommon::htmlareablocked()) { return $message; }
+# Always allow the <m>-tag
+ my %html=(M=>1);
+# Check if more is allowed
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> <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, SUB=>1, SUP=>1, SPAN=>1,
- H1=>1, H2=>1, H3=>1, H4=>1, H5=>1);
-
- $message =~ s/\<(\/?\s*(\w+)[^\>\<]*)/
+ %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, SUB=>1, SUP=>1, SPAN=>1,
+ H1=>1, H2=>1, H3=>1, H4=>1, H5=>1);
+ }
+# Do the substitution of everything that is not explicitly allowed
+ $message =~ s/\<(\/?\s*(\w+)[^\>\<]*)/
{($html{uc($2)}&&(length($1)<1000))?"\<$1":"\<$1"}/ge;
- $message =~ s/(\<?\s*(\w+)[^\<\>]*)\>/
+ $message =~ s/(\<?\s*(\w+)[^\<\>]*)\>/
{($html{uc($2)}&&(length($1)<1000))?"$1\>":"$1\>"}/ge;
- } else {
- $message=~s/\</\<\;/g;
- $message=~s/\>/\>\;/g;
- }
return $message;
}
@@ -1681,6 +1995,7 @@ sub adddiscuss {
$contrib{'history'} = '';
my $numoldver = 0;
my ($oldsymb,$oldidx)=split(/\:\:\:/,$ENV{'form.editdisc'});
+ $oldsymb=~s|(bulletin___\d+___)adm/wrapper/|$1|;
# get timestamp for last post and history
my %oldcontrib=&Apache::lonnet::restore($oldsymb,$ENV{'request.course.id'},
$ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
@@ -1697,11 +2012,20 @@ sub adddiscuss {
}
$contrib{'history'} = $oldcontrib{$oldidx.':history'}.':';
}
+ my $numnewver = $numoldver + 1;
if (defined($oldcontrib{$oldidx.':subject'})) {
- $contrib{'subject'} = $oldcontrib{$oldidx.':subject'}.'::::'.$numoldver.'::::'.$contrib{'subject'};
+ if ($oldcontrib{$oldidx.':subject'} =~ /::::\d+::::/) {
+ $contrib{'subject'} = $oldcontrib{$oldidx.':subject'}.'::::'.$numnewver.'::::'.$contrib{'subject'};
+ } else {
+ $contrib{'subject'} = '::::0::::'.$oldcontrib{$oldidx.':subject'}.'::::1::::'.$contrib{'subject'};
+ }
}
if (defined($oldcontrib{$oldidx.':message'})) {
- $contrib{'message'} = $oldcontrib{$oldidx.':message'}.'::::'.$numoldver.'::::'.$contrib{'message'};
+ if ($oldcontrib{$oldidx.':message'} =~ /::::\d+::::/) {
+ $contrib{'message'} = $oldcontrib{$oldidx.':message'}.'::::'.$numnewver.'::::'.$contrib{'message'};
+ } else {
+ $contrib{'message'} = '::::0::::'.$oldcontrib{$oldidx.':message'}.'::::1::::'.$contrib{'message'};
+ }
}
$contrib{'history'} .= $oldcontrib{$oldidx.':timestamp'};
foreach (keys %contrib) {
@@ -1757,7 +2081,7 @@ sub show_preview {
}
sub generate_preview_button {
- my $pre=&mt("Show Preview");
+ my $pre=&mt("Show Preview and Check Spelling");
return(<<ENDPREVIEW);
<form name="preview" action="/adm/feedback?preview=1" method="post" target="preview">
<input type="hidden" name="subject">
@@ -1768,6 +2092,300 @@ onClick="if (typeof(document.mailform.on
ENDPREVIEW
}
+sub modify_attachments {
+ my ($r,$currnewattach,$currdelold,$symb,$idx,$attachmenturls)=@_;
+ my $subject=&clear_out_html($ENV{'form.subject'});
+ $subject=~s/\n/\<br \/\>/g;
+ $subject=&Apache::lontexconvert::msgtexconverted($subject);
+ my $timestamp=$ENV{'form.timestamp'};
+ my $numoldver=$ENV{'form.numoldver'};
+ my $bodytag=&Apache::loncommon::bodytag('Discussion Post Attachments',
+ '','');
+ my $msg = '';
+ my @attachments = ();
+ my %currattach = ();
+ if ($idx) {
+ &extract_attachments($attachmenturls,$idx,$numoldver,\$msg,\@attachments,\%currattach,$currdelold);
+ }
+ $r->print(<<END);
+<html>
+<head>
+<title>Managing Attachments</title>
+<script>
+ function setAction () {
+ document.modattachments.action = document.modattachments.origpage.value;
+ document.modattachments.submit();
+ }
+</script>
+</head>
+$bodytag
+<form name="modattachments" method="post" enctype="multipart/form-data" action="/adm/feedback?attach=$symb">
+ <table border="2">
+ <tr>
+ <td>
+ <b>Subject:</b>$subject</b><br /><br />
+END
+ if ($idx) {
+ if ($attachmenturls) {
+ my @currold = keys %currattach;
+ if (@currold > 0) {
+ $r->print("The following attachments were part of the most recent saved version of this posting.<br />Check the checkboxes for any you wish to remove<br />\n");
+ foreach (@currold) {
+ my $id = $_;
+ $attachments[$id] =~ m#/([^/]+)$#;
+ $r->print('<input type="checkbox" name="deloldattach" value="'.$_.'" /> '.$1.'<br />'."\n");
+ }
+ $r->print("<br />");
+ }
+ }
+ }
+ if (@{$currnewattach} > 0) {
+ $r->print("The following attachments have been uploaded for inclusion with this posting.<br />Check the checkboxes for any you wish to remove<br />\n");
+ foreach (@{$currnewattach}) {
+ $_ =~ m#/([^/]+)$#;
+ $r->print('<input type="checkbox" name="delnewattach" value="'.$_.'" /> '.$1.'<br />'."\n");
+ }
+ $r->print("<br />");
+ }
+ $r->print(<<END);
+ Add a new attachment to this post. <input type="file" name="addnewattach" /><input type="button" name="upload" value="Upload" onClick="this.form.submit()" />
+ </td>
+ </tr>
+ </table>
+<input type="hidden" name="subject" value="$ENV{'form.subject'}" />
+<input type="hidden" name="comment" value="$ENV{'form.comment'}" />
+<input type="hidden" name="timestamp" value="$ENV{'form.timestamp'}" />
+<input type="hidden" name="idx" value="$ENV{'form.idx'}" />
+<input type="hidden" name="numoldver" value="$ENV{'form.numoldver'}" />
+<input type="hidden" name="origpage" value="$ENV{'form.origpage'}" />
+<input type="hidden" name="anondiscuss" value="$ENV{'form.anondiscuss'}" />
+<input type="hidden" name="discuss" value="$ENV{'form.discuss'}" />
+END
+ foreach (@{$currnewattach}) {
+ $r->print('<input type="hidden" name="currnewattach" value="'.$_.'" />'."\n");
+ }
+ foreach (@{$currdelold}) {
+ $r->print('<input type="hidden" name="deloldattach" value="'.$_.'" />'."\n");
+ }
+ $r->print(<<END);
+ <input type="button" name="rtntoedit" value="Store Changes" onClick="setAction()"/>
+</form>
+</body>
+</html>
+END
+ return;
+}
+
+sub process_attachments {
+ my ($currnewattach,$currdelold,$keepold) = @_;
+ if (exists($ENV{'form.currnewattach'})) {
+ if (ref($ENV{'form.currnewattach'}) eq 'ARRAY') {
+ @{$currnewattach} = @{$ENV{'form.currnewattach'}};
+ } else {
+ $$currnewattach[0] = $ENV{'form.currnewattach'};
+ }
+ }
+ if (exists($ENV{'form.deloldattach'})) {
+ if (ref($ENV{'form.deloldattach'}) eq 'ARRAY') {
+ @{$currdelold} = @{$ENV{'form.deloldattach'}};
+ } else {
+ $$currdelold[0] = $ENV{'form.deloldattach'};
+ }
+ }
+ if (exists($ENV{'form.delnewattach'})) {
+ my @currdelnew = ();
+ my @currnew = ();
+ if (ref($ENV{'form.delnewattach'}) eq 'ARRAY') {
+ @currdelnew = @{$ENV{'form.delnewattach'}};
+ } else {
+ $currdelnew[0] = $ENV{'form.delnewattach'};
+ }
+ foreach my $newone (@{$currnewattach}) {
+ my $delflag = 0;
+ foreach (@currdelnew) {
+ if ($newone eq $_) {
+ $delflag = 1;
+ last;
+ }
+ }
+ unless ($delflag) {
+ push @currnew, $newone;
+ }
+ }
+ @{$currnewattach} = @currnew;
+ }
+ if (exists($ENV{'form.keepold'})) {
+ if (ref($ENV{'form.keepold'}) eq 'ARRAY') {
+ @{$keepold} = @{$ENV{'form.keepold'}};
+ } else {
+ $$keepold[0] = $ENV{'form.keepold'};
+ }
+ }
+}
+
+sub generate_attachments_button {
+ my ($idx,$attachnum,$ressymb,$now,$currnewattach,$deloldattach,$numoldver,$mode) = @_;
+ my $origpage = $ENV{'REQUEST_URI'};
+ my $att=$attachnum.' '.&mt("attachments");
+ my $response = (<<END);
+<form name="attachment" action="/adm/feedback?attach=$ressymb" method="post">
+Click to add/remove attachments: <input type="button" value="$att"
+onClick="this.form.subject.value=document.mailform.subject.value;this.form.comment.value=document.mailform.comment.value;
+END
+ unless ($mode eq 'board') {
+ $response .= 'javascript:anonchk();';
+ }
+ $response .= (<<ENDATTACH);
+this.form.submit();" />
+<input type="hidden" name="origpage" value="$origpage" />
+<input type="hidden" name="idx" value="$idx" />
+<input type="hidden" name="timestamp" value="$now" />
+<input type="hidden" name="subject" />
+<input type="hidden" name="comment" />
+<input type="hidden" name="anondiscuss" value = "0";
+<input type="hidden" name="discuss" value = "0";
+<input type="hidden" name="numoldver" value="$numoldver" />
+ENDATTACH
+ if (defined($deloldattach)) {
+ if (@{$deloldattach} > 0) {
+ foreach (@{$deloldattach}) {
+ $response .= '<input type="hidden" name="deloldattach" value="'.$_.'" />'."\n";
+ }
+ }
+ }
+ if (defined($currnewattach)) {
+ if (@{$currnewattach} > 0) {
+ foreach (@{$currnewattach}) {
+ $response .= '<input type="hidden" name="currnewattach" value="'.$_.'" />'."\n";
+ }
+ }
+ }
+ $response .= '</form>';
+ return $response;
+}
+
+sub extract_attachments {
+ my ($attachmenturls,$idx,$numoldver,$message,$attachments,$currattach,$currdelold) = @_;
+ if ($attachmenturls =~ m/::::\d+:[\.yn\d]+::::/) {
+ @{$attachments} = split/::::\d+:[\.yn\d]+::::/,$attachmenturls;
+ shift @{$attachments};
+ my $searchstr = '::::';
+ for (my $i=0; $i<@{$attachments}; $i++) {
+ if ($attachmenturls =~ m#^\Q$searchstr\E(\d+)(:[\.yn\d]+)::::#) {
+ my $info = $1.$2;
+ my $attachid = $1-1;
+ $searchstr .= $info.'::::'.$$attachments[$i].'::::';
+ if ($info =~ /\.$numoldver([yn])\./) {
+ if (defined($currdelold)) {
+ if (@{$currdelold} > 0) {
+ unless (grep/^$attachid$/,@{$currdelold}) {
+ my $id = $i;
+ $$currattach{$id} = $1;
+ }
+ } else {
+ my $id = $i;
+ $$currattach{$id} = $1;
+ }
+ } else {
+ my $id = $i;
+ $$currattach{$id} = $1;
+ }
+ }
+ }
+ }
+ my @attached = (sort { $a <=> $b } keys %{$currattach});
+ if (@attached == 1) {
+ my $id = $attached[0];
+ $$attachments[$attached[0]]=~m|/([^/]+)$|;
+ $$message.='<br /><a href="'.$$attachments[$id].'"><tt>'.
+ $1.'</tt></a><br />';
+ &Apache::lonnet::allowuploaded('/adm/feedback',
+ $$attachments[$id]);
+ } elsif (@attached > 1) {
+ $$message.='<ol>';
+ foreach (@attached) {
+ my $id = $_;
+ my ($fname)
+ =($$attachments[$id]=~m|/([^/]+)$|);
+ $$message .= '<li><a href="'.$$attachments[$id].
+ '"><tt>'.
+ $fname.'</tt></a></li>';
+ &Apache::lonnet::allowuploaded('/adm/feedback',
+ $$attachments[$id]);
+ }
+ $$message .= '</ol><br />';
+ }
+ } else {
+ my ($fname)
+ =($attachmenturls=~m|/([^/]+)$|);
+ $$message .='<p>'.&mt('Attachment').
+ ': <a href="'.$attachmenturls.
+ '"><tt>'.
+ $fname.'</tt></a></p>';
+ $$attachments[0] = $attachmenturls;
+ $$currattach{'0'} = 'n';
+ &Apache::lonnet::allowuploaded('/adm/feedback',
+ $attachmenturls);
+ }
+}
+
+sub construct_attachmenturl {
+ my ($currnewattach,$keepold,$symb,$idx)=@_;
+ my $oldattachmenturl;
+ my $newattachmenturl;
+ my $startnum = 1;
+ my $currver = 0;
+ if (($ENV{'form.editdisc'}) && ($idx)) {
+ my %contrib=&Apache::lonnet::restore($symb,$ENV{'request.course.id'},
+ $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+ $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+ $oldattachmenturl = $contrib{$idx.':attachmenturl'};
+ if ($contrib{$idx.':history'}) {
+ if ($contrib{$idx.':history'} =~ /:/) {
+ my @oldversions = split/:/,$contrib{$idx.':history'};
+ $currver = 1 + scalar(@oldversions);
+ } else {
+ $currver = 2;
+ }
+ } else {
+ $currver = 1;
+ }
+ if ($oldattachmenturl) {
+ if ($oldattachmenturl =~ m/::::\d+:[\.yn\d]+::::/) {
+ my @attachments = split/::::\d+:[\.yn\d]+::::/,$oldattachmenturl;
+ shift @attachments;
+ $startnum += @attachments;
+ my $searchstr = '::::';
+ $newattachmenturl = '::::';
+ for (my $i=0; $i<@attachments; $i++) {
+ if ($oldattachmenturl =~ m#^\Q$searchstr\E(\d+)(:[\.yn\d]+)::::#) {
+ my $attachid = $1 - 1;
+ $searchstr .= $1.$2.'::::'.$attachments[$i].'::::';
+ $newattachmenturl .= $1.$2;
+ if (grep/^$attachid$/,@{$keepold}) {
+ $newattachmenturl .= '.'.$currver.'n.';
+ }
+ $newattachmenturl .= '::::'.$attachments[$i].'::::';
+ }
+ }
+ $newattachmenturl =~ s/::::$//;
+ } else {
+ $newattachmenturl = '::::1:.0n.';
+ unless (grep/^0$/,@{$keepold}) {
+ $newattachmenturl .= '.1n.';
+ }
+ $newattachmenturl .= '::::'.$oldattachmenturl;
+ $startnum ++;
+ }
+ }
+ }
+ for (my $i=0; $i<@{$currnewattach}; $i++) {
+ my $attachnum = $startnum + $i;
+ $newattachmenturl .= '::::'.$attachnum.':.'.$currver.'n.::::'.$$currnewattach[$i];
+ }
+ return $newattachmenturl;
+}
+
sub handler {
my $r = shift;
if ($r->header_only) {
@@ -1779,7 +2397,127 @@ sub handler {
# --------------------------- Get query string for limited number of parameters
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
- ['hide','unhide','deldisc','postdata','preview','replydisc','editdisc','threadedon','threadedoff','onlyunread','allposts','previous','markread','markonread','markondisp','modifydisp','changes','navmaps','navurl','sortfilter','sortposts','applysort','rolefilter','statusfilter','sectionpick','posterlist','userpick']);
+ ['hide','unhide','deldisc','postdata','preview','replydisc','editdisc','threadedon','threadedoff','onlyunread','allposts','onlyunmark','previous','markread','markonread','markondisp','toggoff','toggon','modifydisp','changes','navmaps','navurl','sortfilter','sortposts','applysort','rolefilter','statusfilter','sectionpick','posterlist','userpick','attach','origpage','currnewattach','deloldattach','keepold','allversions']);
+ if ($ENV{'form.discsymb'}) {
+ my $symb = $ENV{'form.discsymb'};
+ my $readkey = $symb.'_read';
+ my %readinghash = ();
+ my $chgcount = 0;
+ %readinghash = &Apache::lonnet::get('nohist_'.$ENV{'request.course.id'}.'_discuss',[$readkey],$ENV{'user.domain'},$ENV{'user.name'});
+ foreach my $key (keys %ENV) {
+ if ($key =~ m/^form\.postunread_(\d+)/) {
+ if ($readinghash{$readkey} =~ /\.$1\./) {
+ $readinghash{$readkey} =~ s/\.$1\.//;
+ $chgcount ++;
+ }
+ } elsif ($key =~ m/^form\.postread_(\d+)/) {
+ unless ($readinghash{$readkey} =~ /\.$1\./) {
+ $readinghash{$readkey} .= '.'.$1.'.';
+ $chgcount ++;
+ }
+ }
+ }
+ if ($chgcount > 0) {
+ &Apache::lonnet::put('nohist_'.$ENV{'request.course.id'}.'_discuss',\%readinghash,$ENV{'user.domain'},$ENV{'user.name'});
+ }
+ &Apache::loncommon::content_type($r,'text/html');
+ $r->send_http_header;
+ my ($map,$ind,$url)=&Apache::lonnet::decode_symb($symb);
+ my $previous=$ENV{'form.previous'};
+ my $feedurl = &Apache::lonnet::clutter($url);
+ &redirect_back($r,$feedurl,&mt('Marked postings read/unread').'<br />','0','0','',$previous,'','','',);
+ return OK;
+ }
+ if ($ENV{'form.allversions'}) {
+ &Apache::loncommon::content_type($r,'text/html');
+ $r->send_http_header;
+ my $bodytag=&Apache::loncommon::bodytag('Discussion Post Versions',
+ '','');
+ $r->print (<<END);
+<html>
+<head>
+<title>Post Versions</title>
+<meta http-equiv="pragma" content="no-cache" />
+</head>
+$bodytag
+END
+ my $crs='/'.$ENV{'request.course.id'};
+ if ($ENV{'request.course.sec'}) {
+ $crs.='_'.$ENV{'request.course.sec'};
+ }
+ $crs=~s/\_/\//g;
+ my $seeid=&Apache::lonnet::allowed('rin',$crs);
+ my ($symb,$idx)=split(/\:\:\:/,$ENV{'form.allversions'});
+ my $ressymb=$symb;
+ unless ($ressymb =~ m|bulletin___\d+___adm/wrapper|) {
+ $ressymb=~s|(bulletin___\d+___)|$1adm/wrapper|;
+ }
+ if ($idx > 0) {
+ my %contrib=&Apache::lonnet::restore($ressymb,$ENV{'request.course.id'},
+ $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+ $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+ if ($contrib{$idx.':history'}) {
+ my $attachmenturls = $contrib{$idx.':attachmenturl'};
+ my @postversions = ();
+ if ($contrib{$idx.':history'} =~ m/:/) {
+ @postversions = split/:/,$contrib{$idx.':history'};
+ } else {
+ @postversions = ("$contrib{$idx.':history'}");
+ }
+ if (@postversions > 0) {
+ push @postversions,$contrib{$idx.':timestamp'};
+ my $screenname=&Apache::loncommon::screenname(
+ $contrib{$idx.':sendername'},
+ $contrib{$idx.':senderdomain'});
+ my $plainname=&Apache::loncommon::nickname(
+ $contrib{$idx.':sendername'},
+ $contrib{$idx.':senderdomain'});
+ my $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;
+ }
+ $r->print('<b>'.$sender.'</b><br /><ul>');
+ for (my $i=0; $i<@postversions; $i++) {
+ my ($timesent,$message,$subject,$attachmsg);
+ $timesent = &Apache::lonlocal::locallocaltime($postversions[$i]);
+ if ($i == @postversions-1) {
+ ($message)=($contrib{$idx.':message'} =~ /.*::::\Q$i\E::::(.+?)$/si);
+ ($subject)=($contrib{$idx.':subject'} =~ /.*::::\Q$i\E::::(.+?)$/si);
+ } else {
+ ($message)=($contrib{$idx.':message'} =~ /::::\Q$i\E::::(.+?)::::/si);
+ ($subject)=($contrib{$idx.':subject'} =~ /::::\Q$i\E::::(.+?)::::/si);
+ }
+ $message=~s/\n/\<br \/\>/g;
+ $message=&Apache::lontexconvert::msgtexconverted($message);
+ $subject=~s/\n/\<br \/\>/g;
+ $subject=&Apache::lontexconvert::msgtexconverted($subject);
+ if ($attachmenturls) {
+ my @attachments = ();
+ my %currattach = ();
+ &extract_attachments($attachmenturls,$idx,$i,\$attachmsg,\@attachments,\%currattach);
+ }
+ if ($attachmsg) {
+ $attachmsg = '<br />Attachments:'.$attachmsg.'<br />';
+ } else {
+ $attachmsg = '<br />';
+ }
+ $r->print (<<END);
+<li><b>$subject</b>, $timesent<br />
+$message<br />
+$attachmsg</li>
+END
+ }
+ $r->print('</ul></body></html>');
+ }
+ }
+ }
+ return OK;
+ }
if ($ENV{'form.posterlist'}) {
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
@@ -1910,19 +2648,36 @@ ENDREDIR
my $symb=$ENV{'form.modifydisp'};
my ($map,$ind,$url)=&Apache::lonnet::decode_symb($symb);
my $previous=$ENV{'form.previous'};
- my ($dispchg,$markchg) = split/_/,$ENV{'form.changes'};
+ my ($dispchgA,$dispchgB,$markchg,$toggchg) = split/_/,$ENV{'form.changes'};
my $feedurl = &Apache::lonnet::clutter($url);
# backward compatibility (bulletin boards used to be 'wrapped')
if ($feedurl=~m|^/adm/wrapper/adm/.*/bulletinboard$|) {
$feedurl=~s|^/adm/wrapper||;
}
- &print_display_options($r,$symb,$previous,$dispchg,$markchg,$feedurl);
+ &print_display_options($r,$symb,$previous,$dispchgA,$dispchgB,$markchg,$toggchg,$feedurl);
return OK;
- } elsif (($ENV{'form.markondisp'}) || ($ENV{'form.markonread'}) || ($ENV{'form.allposts'}) || ($ENV{'form.onlyunread'}) ) {
+ } elsif (($ENV{'form.markondisp'}) || ($ENV{'form.markonread'}) || ($ENV{'form.allposts'}) || ($ENV{'form.onlyunread'}) || $ENV{'form.onlyunmark'} || $ENV{'form.toggoff'} || $ENV{'form.toggon'} ) {
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
my $previous=$ENV{'form.previous'};
my ($map,$ind,$url);
+ if ( ($ENV{'form.toggoff'}) || ($ENV{'form.toggon'}) ) {
+# ------------------------------ Modify setting for read/unread toggle for each post
+ my $symb=$ENV{'form.toggoff'}?$ENV{'form.toggoff'}:$ENV{'form.toggon'};
+ my $ressymb = $symb;
+ ($map,$ind,$url)=&Apache::lonnet::decode_symb($symb);
+ unless ($ressymb =~ m|bulletin___\d+___adm/wrapper|) {
+ $ressymb=~s|(bulletin___\d+___)|$1adm/wrapper|;
+ }
+ my %discinfo = ();
+ my $toggkey = $ressymb.'_readtoggle';
+ if ($ENV{'form.toggon'}) {
+ $discinfo{$toggkey} = 1;
+ } elsif ($ENV{'form.toggoff'}) {
+ $discinfo{$toggkey} = 0;
+ }
+ &Apache::lonnet::put('nohist_'.$ENV{'request.course.id'}.'_discuss',\%discinfo,$ENV{'user.domain'},$ENV{'user.name'});
+ }
if (($ENV{'form.markondisp'}) || ($ENV{'form.markonread'})) {
# ---------------------- Modify setting for identification of 'NEW' posts in this discussion
my $symb=$ENV{'form.markondisp'}?$ENV{'form.markondisp'}:$ENV{'form.markonread'};
@@ -1945,9 +2700,16 @@ ENDREDIR
}
&Apache::lonnet::put('nohist_'.$ENV{'request.course.id'}.'_discuss',\%discinfo,$ENV{'user.domain'},$ENV{'user.name'});
}
- if (($ENV{'form.allposts'}) || ($ENV{'form.onlyunread'})) {
+ if (($ENV{'form.allposts'}) || ($ENV{'form.onlyunread'}) || ($ENV{'form.onlyunmark'}) ) {
# ----------------------------------------------------------------- Modify display setting for this discussion
- my $symb=$ENV{'form.allposts'}?$ENV{'form.allposts'}:$ENV{'form.onlyunread'};
+ my $symb;
+ if ($ENV{'form.allposts'}) {
+ $symb = $ENV{'form.allposts'};
+ } elsif ($ENV{'form.onlyunread'}) {
+ $symb = $ENV{'form.onlyunread'};
+ } else {
+ $symb = $ENV{'form.onlyunmark'};
+ }
my $ressymb = $symb;
($map,$ind,$url)=&Apache::lonnet::decode_symb($symb);
unless ($ressymb =~ m|bulletin___\d+___adm/wrapper|) {
@@ -1956,19 +2718,22 @@ ENDREDIR
my %discinfo = ();
if ($ENV{'form.allposts'}) {
$discinfo{$ressymb.'_showonlyunread'} = 0;
+ $discinfo{$ressymb.'_showonlyunmark'} = 0;
} elsif ($ENV{'form.onlyunread'}) {
$discinfo{$ressymb.'_showonlyunread'} = 1;
+ } else {
+ $discinfo{$ressymb.'_showonlyunmark'} = 1;
}
&Apache::lonnet::put('nohist_'.$ENV{'request.course.id'}.'_discuss',\%discinfo,$ENV{'user.domain'},$ENV{'user.name'});
}
- if (($ENV{'form.markonread'}) || ($ENV{'form.allposts'}) || ($ENV{'form.onlyunread'}) ) {
+ if (($ENV{'form.markonread'}) || ($ENV{'form.allposts'}) || ($ENV{'form.onlyunread'}) || ($ENV{'form.onlyunmark'}) ||($ENV{'form.toggoff'}) || ($ENV{'form.toggon'}) ) {
&redirect_back($r,&Apache::lonnet::clutter($url),&mt('Changed display status').'<br />','0','0','',$previous);
} else {
&redirect_back($r,&Apache::lonnet::clutter($url),&mt('Changed display status').'<br />','0','0');
}
return OK;
} elsif ($ENV{'form.markread'}) {
-# ----------------------------------------------------------------- Mark new posts as read
+# ----------------------------------------------------------------- Mark new posts not NEW
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
my $symb=$ENV{'form.markread'};
@@ -2073,6 +2838,38 @@ ENDREDIR
$r->content_type('text/html');
$r->send_http_header;
&show_preview($r);
+ } elsif ($ENV{'form.attach'}) {
+# -------------------------------------------------------- Work on attachments
+ &Apache::loncommon::content_type($r,'text/html');
+ $r->send_http_header;
+ &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['subject','comment','addnewattach','delnewattach','timestamp','numoldver','idx','anondiscuss','discuss']);
+ my @currnewattach = ();
+ my @currdelold = ();
+ my @keepold = ();
+ &process_attachments(\@currnewattach,\@currdelold,\@keepold);
+ if (exists($ENV{'form.addnewattach.filename'})) {
+ unless (length($ENV{'form.addnewattach'})>131072) {
+ my $subdir = 'feedback/'.$ENV{'form.timestamp'};
+ my $newattachment=&Apache::lonnet::userfileupload('addnewattach',undef,$subdir);
+ push @currnewattach, $newattachment;
+ }
+ }
+ my $attachmenturls = '';
+ my $idx = $ENV{'form.idx'};
+ my $symb = $ENV{'form.attach'};
+ if ($idx) {
+ my %contrib=&Apache::lonnet::restore($symb,$ENV{'request.course.id'},
+ $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+ $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+ $attachmenturls = $contrib{$idx.':attachmenturl'};
+ }
+ &modify_attachments($r,\@currnewattach,\@currdelold,$symb,$idx,$attachmenturls);
+ } elsif ($ENV{'form.chgreads'}) {
+ &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');
} else {
# ------------------------------------------------------------- Normal feedback
my $feedurl=$ENV{'form.postdata'};
@@ -2090,6 +2887,8 @@ ENDREDIR
$symb=(split(/\:\:\:/,$ENV{'form.editdisc'}))[0];
my ($map,$id,$url)=&Apache::lonnet::decode_symb($symb);
$feedurl=&Apache::lonnet::clutter($url);
+ } elsif ($ENV{'form.origpage'}) {
+ $symb="";
} else {
$symb=&Apache::lonnet::symbread($feedurl);
}
@@ -2126,7 +2925,7 @@ ENDREDIR
unless ($ENV{'form.sendit'}) {
my $options=&screen_header($feedurl);
if ($options) {
- &mail_screen($r,$feedurl,$options);
+ &mail_screen($r,$feedurl,$options);
} else {
&fail_redirect($r,$feedurl);
}
@@ -2148,7 +2947,22 @@ ENDREDIR
&Apache::lonnet::delenv('allowed.vgr');
# Get attachments, if any, and not too large
my $attachmenturl='';
- if ($ENV{'form.attachment.filename'}) {
+ if (($ENV{'form.origpage'}) || ($ENV{'form.editdisc'}) || ($ENV{'form.replydisc'})) {
+ my ($symb,$idx);
+ if ($ENV{'form.replydisc'}) {
+ ($symb,$idx)=split(/\:\:\:/,$ENV{'form.replydisc'});
+ } elsif ($ENV{'form.editdisc'}) {
+ ($symb,$idx)=split(/\:\:\:/,$ENV{'form.editdisc'});
+ } elsif ($ENV{'form.origpage'}) {
+ $symb = $ENV{'form.symb'};
+ }
+ my @currnewattach = ();
+ my @deloldattach = ();
+ my @keepold = ();
+ &process_attachments(\@currnewattach,\@deloldattach,\@keepold);
+ $symb=~s|(bulletin___\d+___)adm/wrapper/|$1|;
+ $attachmenturl=&construct_attachmenturl(\@currnewattach,\@keepold,$symb,$idx);
+ } elsif ($ENV{'form.attachment.filename'}) {
unless (length($ENV{'form.attachment'})>131072) {
$attachmenturl=&Apache::lonnet::userfileupload('attachment',undef,'feedback');
}