--- loncom/interface/lonfeedback.pm 2004/07/24 18:19:38 1.106
+++ loncom/interface/lonfeedback.pm 2005/02/17 04:39:58 1.152
@@ -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.152 2005/02/17 04:39:58 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -36,16 +36,20 @@ use Apache::loncommon();
use Apache::lontexconvert();
use Apache::lonlocal; # must not have ()
use Apache::lonhtmlcommon();
+use Apache::lonnavmaps;
+use Apache::lonenc();
+use HTML::LCParser();
use Apache::lonspeller();
+use Cwd;
sub discussion_open {
- my ($status)=@_;
+ my ($status,$symb)=@_;
if (defined($status) &&
!($status eq 'CAN_ANSWER' || $status eq 'CANNOT_ANSWER'
|| $status eq 'OPEN')) {
return 0;
}
- my $close=&Apache::lonnet::EXT('resource.0.discussend');
+ my $close=&Apache::lonnet::EXT('resource.0.discussend',$symb);
if (defined($close) && $close ne '' && $close < time) {
return 0;
}
@@ -57,16 +61,25 @@ sub discussion_visible {
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;
+ if (!$ENV{'request.role.adv'}) { return 0; }
}
}
return 1;
}
sub list_discussion {
- my ($mode,$status,$symb)=@_;
-
+ my ($mode,$status,$ressymb,$imsextras)=@_;
my $outputtarget=$ENV{'form.grade_target'};
+ if (defined($ENV{'form.export'})) {
+ if($ENV{'form.export'}) {
+ $outputtarget = 'export';
+ }
+ }
+ if (defined($imsextras)) {
+ if ($$imsextras{'caller'} eq 'imsexport') {
+ $outputtarget = 'export';
+ }
+ }
if (not &discussion_visible($status)) { return ''; }
my @bgcols = ("#cccccc","#eeeeee");
my $discussiononly=0;
@@ -76,32 +89,33 @@ sub list_discussion {
my $cid=$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 ''; }
+ $crs=~s/\_/\//g;
+ unless ($ressymb) { $ressymb=&Apache::lonnet::symbread(); }
+ unless ($ressymb) { return ''; }
+ $ressymb=&wrap_symb($ressymb);
+ my $encsymb=&Apache::lonenc::check_encrypt($ressymb);
+ my $viewgrades=(&Apache::lonnet::allowed('vgr',$crs)
+ && ($ressymb=~/\.(problem|exam|quiz|assess|survey|form)$/));
+
my %usernamesort = ();
my %namesort =();
my %subjectsort = ();
-# 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 $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';
+ $ressymb=$encsymb;
+ 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;
@@ -112,9 +126,19 @@ sub list_discussion {
# Retain identification of "NEW" posts identified in last display, if continuing 'previous' browsing of posts.
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['previous','sortposts','rolefilter','statusfilter','sectionpick','totposters']);
my $sortposts = $ENV{'form.sortposts'};
- my $rolefilter = $ENV{'form.rolefilter'};
my $statusfilter = $ENV{'form.statusfilter'};
- my $sectionpick = $ENV{'form.sectionpick'};
+ my @sectionpick = ();
+ if ($ENV{'form.sectionpick'} =~ /,/) {
+ @sectionpick = split/,/,$ENV{'form.sectionpick'};
+ } else {
+ $sectionpick[0] = $ENV{'form.sectionpick'};
+ }
+ my @rolefilter = ();
+ if ($ENV{'form.rolefilter'} =~ /,/) {
+ @rolefilter = split/,/,$ENV{'form.rolefilter'};
+ } else {
+ $rolefilter[0] = $ENV{'form.rolefilter'};
+ }
my $totposters = $ENV{'form.totposters'};
$previous = $ENV{'form.previous'};
if ($previous > 0) {
@@ -125,20 +149,25 @@ 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) {
+ if ($ENV{'form.rolefilter'}) {
%roleshash = &Apache::lonnet::dump('nohist_userroles',$ENV{'course.'.$ENV{'request.course.id'}.'.domain'},$ENV{'course.'.$ENV{'request.course.id'}.'.num'});
foreach (keys %roleshash) {
my ($role,$uname,$udom,$sec) = split/:/,$_;
+ if ($role =~ /^cr/) {
+ $role = 'cr';
+ }
my ($end,$start) = split/:/,$roleshash{$_};
my $now = time;
my $status = 'Active';
if (($now < $start) || ($end > 0 && $now > $end)) {
$status = 'Expired';
}
- push @{$roleinfo{$uname.':'.$udom}}, $role.':'.$sec.':'.$status;
+ if ($uname && $udom) {
+ push @{$roleinfo{$uname.':'.$udom}}, $role.':'.$sec.':'.$status;
+ }
}
my ($classlist) = &Apache::loncoursedata::get_classlist(
$ENV{'request.course.id'},
@@ -154,48 +183,54 @@ sub list_discussion {
}
# 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') {
+ if ($ENV{'environment.discdisplay'} eq 'unread') {
$showonlyunread = 1;
}
- my $discmarkread=$userenv{'discmarkread'};
- if ($discmarkread eq 'ondisp') {
+ if ($ENV{'environment.discmarkread'} eq 'ondisp') {
$markondisp = 1;
}
# Override user's default if user specified display setting for this discussion
if (defined($dischash{$ondispkey})) {
- $markondisp = $dischash{$ondispkey};
+ unless ($dischash{$ondispkey} eq '') {
+ $markondisp = $dischash{$ondispkey};
+ }
}
if ($markondisp) {
$discinfo{$lastkey} = time;
}
if (defined($dischash{$showkey})) {
- $showonlyunread = $dischash{$showkey};
+ unless ($dischash{$showkey} eq '') {
+ $showonlyunread = $dischash{$showkey};
+ }
+ }
+
+ if (defined($dischash{$markkey})) {
+ unless ($dischash{$markkey} eq '') {
+ $showunmark = $dischash{$markkey};
+ }
}
if (defined($dischash{$visitkey})) {
- $visit = $dischash{$visitkey};
+ unless ($dischash{$visitkey} eq '') {
+ $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=();
my %shown = ();
my @posteridentity=();
- 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 $current=0;
my $visible=0;
my @depth=();
- my @original=();
- my @index=();
- my @replies=();
+ my @replies = ();
my %alldiscussion=();
+ my %imsitems=();
+ my %imsfiles=();
my %notshown = ();
my %newitem = ();
my $maxdepth=0;
@@ -205,317 +240,19 @@ 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 $studenthidden=($contrib{'studenthidden'}=~/\.$idx\./);
- my $deleted=($contrib{'deleted'}=~/\.$idx\./);
- my $origindex='0.';
- my $numoldver=0;
- if ($contrib{$idx.':replyto'}) {
- if ( (($ENV{'environment.threadeddiscussion'}) && (($sortposts eq '') || ($sortposts eq 'ascdate'))) || ($sortposts eq 'thread')) {
-# 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 {
- $original[$idx]=0;
- $depth[$idx]=0;
- }
- } 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++;
- if ($contrib{$idx.':history'}) {
- if ($contrib{$idx.':history'} =~ /:/) {
- my @oldversions = split/:/,$contrib{$idx.':history'};
- $numoldver = @oldversions;
- } else {
- $numoldver = 1;
- }
- }
- my $message=$contrib{$idx.':message'};
- $message=~s/\n/\<br \/\>/g;
- $message=&Apache::lontexconvert::msgtexconverted($message,undef,$numoldver);
- my $subject=$contrib{$idx.':subject'};
- if (defined($subject)) {
- $subject=~s/\n/\<br \/\>/g;
- $subject=&Apache::lontexconvert::msgtexconverted($subject,undef,$numoldver);
- }
- 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 ($message) {
- if ($hidden) {
- $message='<font color="#888888">'.$message.'</font>';
- if ($studenthidden) {
- $message .='<br /><br />Deleted by poster (student).';
- }
- }
- 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');
-# Set up for sorting by subject
- if ($contrib{$idx.':subject'} eq '') {
- if (defined($subjectsort{'__No subject'})) {
- push @{$subjectsort{'__No subject'}}, $idx;
- } else {
- @{$subjectsort{'__No subject'}} = ("$idx");
- }
- } else {
- if (defined($subjectsort{$contrib{$idx.':subject'}})) {
- push @{$subjectsort{$contrib{$idx.':subject'}}}, $idx;
- } else {
- @{$subjectsort{$contrib{$idx.':subject'}}} = ("$idx");
- }
- }
- 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;
- }
-# Set up for sorting by domain, then username
- unless (defined($usernamesort{$contrib{$idx.':senderdomain'}})) {
- %{$usernamesort{$contrib{$idx.':senderdomain'}}} = ();
- }
- if (defined($usernamesort{$contrib{$idx.':senderdomain'}}{$contrib{$idx.':sendername'}})) {
- push @{$usernamesort{$contrib{$idx.':senderdomain'}}{$contrib{$idx.':sendername'}}}, $idx;
- } else {
- @{$usernamesort{$contrib{$idx.':senderdomain'}}{$contrib{$idx.':sendername'}}} = ("$idx");
- }
-# Set up for sorting by last name, then first name
- my %names = &Apache::lonnet::get('environment',['firstname','lastname'],
- $contrib{$idx.':senderdomain'},$contrib{$idx.':sendername'});
- my $lastname = $names{'lastname'};
- my $firstname = $names{'firstname'};
- if ($lastname eq '') {
- $lastname = '_';
- }
- if ($firstname eq '') {
- $firstname = '_';
- }
- unless (defined($namesort{$lastname})) {
- %{$namesort{$lastname}} = ();
- }
- if (defined($namesort{$lastname}{$firstname})) {
- push @{$namesort{$lastname}{$firstname}}, $idx;
- } else {
- @{$namesort{$lastname}{$firstname}} = ("$idx");
- }
- if ($ENV{"course.$cid.allow_discussion_post_editing"} =~ m/yes/i) {
- if (($ENV{'user.domain'} eq $contrib{$idx.':senderdomain'}) && ($ENV{'user.name'} eq $contrib{$idx.':sendername'})) {
- $sender.=' <a href="/adm/feedback?editdisc='.
- $ressymb.':::'.$idx;
- if ($newpostsflag) {
- $sender .= '&previous='.$prevread;
- }
- $sender .= '" '.$target.'>'.&mt('Edit').'</a>'; unless ($seeid) {
- $sender.=" <a href=\"javascript:studentdelete('$ressymb','$idx','$newpostsflag','$prevread')";
- $sender .= '">'.&mt('Delete').'</a>';
- }
- }
- }
- if ($seeid) {
- if ($hidden) {
- unless ($studenthidden) {
- $sender.=' <a href="/adm/feedback?unhide='.
- $ressymb.':::'.$idx;
- if ($newpostsflag) {
- $sender .= '&previous='.$prevread;
- }
- $sender .= '">'.&mt('Make Visible').'</a>';
- }
- } else {
- $sender.=' <a href="/adm/feedback?hide='.
- $ressymb.':::'.$idx;
- if ($newpostsflag) {
- $sender .= '&previous='.$prevread;
- }
- $sender .= '">'.&mt('Hide').'</a>';
- }
- $sender.=' <a href="/adm/feedback?deldisc='.
- $ressymb.':::'.$idx;
- if ($newpostsflag) {
- $sender .= '&previous='.$prevread;
- }
- $sender .= '">'.&mt('Delete').'</a>';
- }
- } else {
- if ($screenname) {
- $sender='<i>'.$screenname.'</i>';
- }
-# Set up for sorting by domain, then username for anonymous
- unless (defined($usernamesort{'__anon'})) {
- %{$usernamesort{'__anon'}} = ();
- }
- if (defined($usernamesort{'__anon'}{'__anon'})) {
- push @{$usernamesort{'__anon'}{'__anon'}}, $idx;
- } else {
- @{$usernamesort{'__anon'}{'__anon'}} = ("$idx");
- }
-# Set up for sorting by last name, then first name for anonymous
- unless (defined($namesort{'__anon'})) {
- %{$namesort{'__anon'}} = ();
- }
- if (defined($namesort{'__anon'}{'__anon'})) {
- push @{$namesort{'__anon'}{'__anon'}}, $idx;
- } else {
- @{$namesort{'__anon'}{'__anon'}} = ("$idx");
- }
- }
- 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;
- if ($newpostsflag) {
- $sender .= '&previous='.$prevread;
- }
- $sender .= '" '.$target.'>'.&mt('Reply').'</a>';
- }
- 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'}) && (($sortposts eq '') || ($sortposts eq 'ascdate'))) || ($sortposts eq 'thread')) {
- $thisindex=$origindex.substr('00'.$replies[$depth[$idx]],-2,2);
- }
- $alldiscussion{$thisindex}=$idx;
- $shown{$idx} = 0;
- $index[$idx]=$thisindex;
- my $spansize = 2;
- if ($showonlyunread && $prevread > $posttime) {
- $notshown{$idx} = 1;
- } else {
- my $uname = $contrib{$idx.':sendername'};
- my $udom = $contrib{$idx.':senderdomain'};
- my $poster = $uname.':'.$udom;
- my $rolematch = '';
- my $skiptest = 1;
- if ($totposters > 0) {
- if (grep/^$poster$/,@posters) {
- $shown{$idx} = 1;
- }
- } else {
- if ($rolefilter) {
- if ($rolefilter eq 'all') {
- $rolematch = '([^:]+)';
- } else {
- $rolematch = $rolefilter;
- $skiptest = 0;
- }
- }
- if ($sectionpick) {
- if ($sectionpick eq 'all') {
- $rolematch .= ':([^:]*)';
- } else {
- $rolematch .= ':'.$sectionpick;
- $skiptest = 0;
- }
- }
- if ($statusfilter) {
- if ($statusfilter eq 'all') {
- $rolematch .= ':([^:]+)';
- } else {
- $rolematch .= ':'.$statusfilter;
- $skiptest = 0;
- }
- }
- if ($skiptest) {
- $shown{$idx} = 1;
- } else {
- foreach my $role (@{$roleinfo{$poster}}) {
- if ($role =~ m/^$rolematch$/) {
- $shown{$idx} = 1;
- last;
- }
- }
- }
- }
- }
- unless ($notshown{$idx} == 1) {
- 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>';
- 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: ');
- if ($contrib{$idx.':history'} =~ m/:/) {
- @postversions = split/:/,$contrib{$idx.':history'};
- } else {
- @postversions = ("$contrib{$idx.':history'}");
- }
- for (my $i=0; $i<@postversions; $i++) {
- my $version = $i+1;
- $discussionitems[$idx] .= '<b>'.$version.'.</b> - '.&Apache::lonlocal::locallocaltime($postversions[$i]).' ';
- }
- $discussionitems[$idx] .= '<br />';
- }
- }
- }
- }
- }
- }
+ &build_posting_display(\%usernamesort,\%subjectsort,\%namesort,\%notshown,\%newitem,\%dischash,\%shown,\%alldiscussion,\%imsitems,\%imsfiles,\%roleinfo,\@discussionitems,\@replies,\@depth,\@posters,\$maxdepth,\$visible,\$newpostsflag,\$current,$status,$viewgrades,$seeid,$prevread,$sortposts,$encsymb,$target,$readkey,$showunmark,$showonlyunread,$totposters,\@rolefilter,\@sectionpick,$statusfilter,$toggkey,$outputtarget);
my $discussion='';
+ my $manifestfile;
+ my $manifestok=0;
+ my $tempexport;
+ my $imsresources;
+ my $copyresult;
my $function = &Apache::loncommon::get_users_function();
my $color = &Apache::loncommon::designparm($function.'.tabbg',
@@ -524,22 +261,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 +296,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;
@@ -561,7 +321,56 @@ sub list_discussion {
if ($visible) {
# Print the discusssion
- if ($outputtarget ne 'tex') {
+ if ($outputtarget eq 'tex') {
+ $discussion.='<tex>\vskip 0 mm\noindent\makebox[2 cm][b]{\hrulefill}'.
+ '\textbf{DISCUSSIONS}\makebox[2 cm][b]{\hrulefill}'.
+ '\vskip 0 mm\noindent\textbf{'.$lt{'cuse'}.'}:\vskip 0 mm'.
+ '\noindent\textbf{'.$lt{'disa'}.'}: \textit{'.$currdisp.'}\vskip 0 mm'.
+ '\noindent\textbf{'.$lt{'npce'}.'}: \textit{'.$currmark.'}</tex>';
+ } elsif ($outputtarget eq 'export') {
+# Create temporary directory if this is an export
+ my $now = time;
+ if ((defined($imsextras)) && ($$imsextras{'caller'} eq 'imsexport')) {
+ $tempexport = $$imsextras{'tempexport'};
+ if (!-e $tempexport) {
+ mkdir($tempexport,0700);
+ }
+ $tempexport .= '/'.$$imsextras{'count'};
+ if (!-e $tempexport) {
+ mkdir($tempexport,0700);
+ }
+ } else {
+ $tempexport = $Apache::lonnet::perlvar{'lonDaemons'}.'/tmp/ims_exports';
+ if (!-e $tempexport) {
+ mkdir($tempexport,0700);
+ }
+ $tempexport .= '/'.$now;
+ if (!-e $tempexport) {
+ mkdir($tempexport,0700);
+ }
+ $tempexport .= '/'.$ENV{'user.domain'}.'_'.$ENV{'user.name'};
+ }
+ if (!-e $tempexport) {
+ mkdir($tempexport,0700);
+ }
+# open manifest file
+ my $manifest = '/imsmanifest.xml';
+ my $manifestfilename = $tempexport.$manifest;
+ if ($manifestfile = Apache::File->new('>'.$manifestfilename)) {
+ $manifestok=1;
+ print $manifestfile qq|
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest xmlns="http://www.imsglobal.org/xsd/imscp_v1p1" xmlns:imsmd="http://www.imsglobal.org/xsd/imsmd_v1p2"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+identifier="MANIFEST-$ressymb" xsi:schemaLocation="http://www.imsglobal.org/xsd/imscp_v1p1
+imscp_v1p1.xsd http://www.imsglobal.org/xsd/imsmd_v1p2 imsmd_v1p2p2.xsd">
+ <organizations default="$ressymb">
+ <organization identifier="$ressymb">
+ <title>Discussion for $ressymb</title>\n|;
+ } else {
+ $discussion .= 'An error occurred opening the manifest file.<br />';
+ }
+ } else {
my $colspan=$maxdepth+1;
$discussion.= qq|
<script>
@@ -577,22 +386,22 @@ sub list_discussion {
}
</script>
|;
- $discussion.='<table bgcolor="#AAAAAA" cellpadding="2" cellspacing="2" border="0">';
+ $discussion.='<form name="readchoices" method="post" action="/adm/feedback?chgreads='.$ressymb.'" ><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) {
$discussion.='<td align="left">'.
- '<a href="/adm/feedback?threadedon='.$ressymb;
+ '<a href="/adm/feedback?cmd=threadedon&symb='.$ressymb;
if ($newpostsflag) {
$discussion .= '&previous='.$prevread;
}
$discussion .='">'.&mt('Threaded View').'</a> '.
- '<a href="/adm/feedback?threadedoff='.$ressymb;
+ '<a href="/adm/feedback?cmd=threadedoff&symb='.$ressymb;
if ($newpostsflag) {
$discussion .= '&previous='.$prevread;
}
$discussion .='">'.&mt('Chronological View').'</a>
- <a href= "/adm/feedback?sortfilter='.$ressymb;
+ <a href= "/adm/feedback?cmd=sortfilter&symb='.$ressymb;
if ($newpostsflag) {
$discussion .= '&previous='.$prevread;
}
@@ -607,7 +416,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=1&symb='.$ressymb.'">'.&mt('Mark NEW posts no longer new').'</a> ';
} else {
$discussion .= '<td> </td>';
}
@@ -615,24 +424,24 @@ sub list_discussion {
$discussion .= '<td> </td>';
}
$discussion .= '</tr></table></td></tr>';
- } else {
- $discussion.='\vskip 0 mm\noindent\makebox[2 cm][b]{\hrulefill}'.
- '\textbf{DISCUSSIONS}\makebox[2 cm][b]{\hrulefill}'.
- '\vskip 0 mm\noindent\textbf{'.$lt{'cuse'}.'}:\vskip 0 mm'.
- '\noindent\textbf{'.$lt{'disa'}.'}: \textit{'.$currdisp.'}\vskip 0 mm'.
- '\noindent\textbf{'.$lt{'npce'}.'}: \textit{'.$currmark.'}';
- }
- 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;
+
+ my $numhidden = keys %notshown;
+ if ($numhidden > 0) {
+ my $colspan = $maxdepth+1;
+ $discussion.="\n".'<tr><td bgcolor="#CCCCCC" colspan="'.$colspan.'">'.
+ '<a href="/adm/feedback?allposts=1&symb='.$ressymb;
+ if ($newpostsflag) {
+ $discussion .= '&previous='.$prevread;
+ }
+ $discussion .= '">'.&mt('Show all posts').'</a> '.&mt('to display').' '.
+ $numhidden.' ';
+ if ($showunmark) {
+ $discussion .= &mt('posts previously marked read');
+ } else {
+ $discussion .= &mt('previously viewed posts');
+ }
+ $discussion .= '<br/></td></tr>';
}
- $discussion .= '">'.&mt('Show all posts').'</a> '.&mt('to display').' '.
- $numhidden.' '.&mt('previously viewed posts').
- '<br/></td></tr>';
}
# Choose sort mechanism
@@ -658,31 +467,26 @@ sub list_discussion {
}
}
} else {
- $sortposts = 'ascdate';
@showposts = (sort { $a <=> $b } keys %alldiscussion);
}
+ my $currdepth = 0;
+ my $firstidx = $alldiscussion{$showposts[0]};
foreach (@showposts) {
- unless (($sortposts eq 'thread') || ($sortposts eq 'ascdate' && $ENV{'environment.threadeddiscussion'})) {
+ unless (($sortposts eq 'thread') || (($sortposts eq '') && ($ENV{'environment.threadeddiscussion'})) || ($outputtarget eq 'export')) {
$alldiscussion{$_} = $_;
}
unless ( ($notshown{$alldiscussion{$_}} eq '1') || ($shown{$alldiscussion{$_}} == 0) ) {
- if ($outputtarget ne 'tex') {
+ if ($outputtarget ne 'tex' && $outputtarget ne 'export') {
$discussion.="\n<tr>";
- } else {
- $discussion.='\vskip 0 mm\noindent\makebox[2 cm][b]{\hrulefill}';
}
my $thisdepth=$depth[$alldiscussion{$_}];
- if ($outputtarget ne 'tex') {
+ if ($outputtarget ne 'tex' && $outputtarget ne 'export') {
for (1..$thisdepth) {
$discussion.='<td> </td>';
}
}
my $colspan=$maxdepth-$thisdepth+1;
- if ($outputtarget ne 'tex') {
- $discussion.='<td bgcolor="'.$bgcols[$newitem{$alldiscussion{$_}}].'" colspan="'.$colspan.'">'.
- $discussionitems[$alldiscussion{$_}].
- '</td></tr>';
- } else {
+ if ($outputtarget eq 'tex') {
#cleanup block
$discussionitems[$alldiscussion{$_}]=~s/<table([^>]*)>/<table TeXwidth="90 mm">/;
$discussionitems[$alldiscussion{$_}]=~s/<tr([^>]*)><td([^>]*)>/<tr><td TeXwidth="20 mm" align="left">/;
@@ -693,19 +497,50 @@ sub list_discussion {
$discussionitems[$alldiscussion{$_}]=~s/<\/td><td([^>]*)>/$threadinsert<\/td><td TeXwidth="65 mm" align="left">/;
$discussionitems[$alldiscussion{$_}]=~s/<a([^>]+)>(Edit|Hide|Delete|Reply|Submissions)<\/a>//g;
$discussionitems[$alldiscussion{$_}]=~s/(<b>|<\/b>|<\/a>|<a([^>]+)>)//g;
-
- #FIXME xmlparse can't be safely called from inside xmlparse
- # due to the global variables that are use, the safe
- # space etc. I expect this has unforseen issues that
- # need resolving.
-
- $discussion.=&Apache::lonxml::xmlparse('','tex',$discussionitems[$alldiscussion{$_}]);
- }
+
+ $discussionitems[$alldiscussion{$_}]='<tex>\vskip 0 mm\noindent\makebox[2 cm][b]{\hrulefill}</tex>'.$discussionitems[$alldiscussion{$_}];
+ $discussion.=$discussionitems[$alldiscussion{$_}];
+ } elsif ($outputtarget eq 'export') {
+ my $postfilename = $alldiscussion{$_}.'-'.$imsitems{$alldiscussion{$_}}{'timestamp'}.'.html';
+ if ($manifestok) {
+ if (($depth[$alldiscussion{$_}] <= $currdepth) && ($alldiscussion{$_} != $firstidx)) {
+ print $manifestfile ' </item>'."\n";
+ }
+ $currdepth = $depth[$alldiscussion{$_}];
+ print $manifestfile "\n".
+ '<item identifier="ITEM-'.$ressymb.'-'.$alldiscussion{$_}.'" isvisible="'.
+ $imsitems{$alldiscussion{$_}}{'isvisible'}.'" identifieref="RES-'.$ressymb.'-'.$alldiscussion{$_}.'">'.
+ '<title>'.$imsitems{$alldiscussion{$_}}{'title'}.'</title>';
+ $imsresources .= "\n".
+ '<resource identifier="RES-'.$ressymb.'-'.$alldiscussion{$_}.'" type="webcontent" href="'.$postfilename.'">'."\n".
+ '<file href="'.$postfilename.'">'."\n".
+ $imsfiles{$alldiscussion{$_}}{$imsitems{$alldiscussion{$_}}{'currversion'}}."\n".
+ '</resource>';
+ }
+ my $postingfile;
+ my $postingfilename = $tempexport.'/'.$postfilename;
+ if ($postingfile = Apache::File->new('>'.$postingfilename)) {
+ print $postingfile '<html><head><title>Discussion Post</title></head><body>'.
+ $imsitems{$alldiscussion{$_}}{'title'}.' '.
+ $imsitems{$alldiscussion{$_}}{'sender'}.
+ $imsitems{$alldiscussion{$_}}{'timestamp'}.'<br /><br />'.
+ $imsitems{$alldiscussion{$_}}{'message'}.'<br />'.
+ $imsitems{$alldiscussion{$_}}{'attach'}.'</body></html>'."\n";
+ close($postingfile);
+ } else {
+ $discussion .= 'An error occurred opening the export file for posting '.$alldiscussion{$_}.'<br />';
+ }
+ $copyresult.=&replicate_attachments($imsitems{$alldiscussion{$_}}{'allattachments'},$tempexport);
+ } else {
+ $discussion.='<td bgcolor="'.$bgcols[$newitem{$alldiscussion{$_}}].
+ '" colspan="'.$colspan.'">'. $discussionitems[$alldiscussion{$_}].
+ '</td></tr>';
+ }
}
}
- if ($outputtarget ne 'tex') {
+ unless ($outputtarget eq 'tex' || $outputtarget eq 'export') {
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,84 +551,803 @@ 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>
+ <td align="left">
+ <font size="-1"><b><a href="$chglink">$lt{'chgt'}</a>?</font></b>
+ </td>
</tr>
</table>
</td>
+END
+ if ($sortposts) {
+ my %sort_types = ();
+ my %role_types = ();
+ my %status_types = ();
+ &sort_filter_names(\%sort_types,\%role_types,\%status_types);
+
+ $discussion .= '<td><font size="-1"><b>'.&mt('Sorted by').'</b>: '.$sort_types{$sortposts}.'<br />';
+ if (defined($ENV{'form.totposters'})) {
+ $discussion .= &mt('Posts by').':';
+ if ($totposters > 0) {
+ foreach my $poster (@posters) {
+ $poster =~ s/:/\@/;
+ $discussion .= ' '.$poster.',';
+ }
+ $discussion =~ s/,$//;
+ } else {
+ $discussion .= &mt('None selected');
+ }
+ } else {
+ my $filterchoice ='';
+ if (@sectionpick > 0) {
+ $filterchoice = '<i>'.&mt('sections').'</i>- '.$ENV{'form.sectionpick'};
+ $filterchoice .= ' ';
+ }
+ if (@rolefilter > 0) {
+ $filterchoice .= '<i>'.&mt('roles').'</i>-';
+ foreach (@rolefilter) {
+ $filterchoice .= ' '.$role_types{$_}.',';
+ }
+ $filterchoice =~ s/,$//;
+ $filterchoice .= '<br />     ';
+ }
+ if ($statusfilter) {
+ $filterchoice .= '<i>'.&mt('status').'</i>- '.$status_types{$statusfilter};
+ }
+ if ($filterchoice) {
+ $discussion .= '<b>'.&mt('Filters').'</b>: '.$filterchoice;
+ }
+ $discussion .= '</font></td>';
+ }
+ }
+ 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 ($outputtarget eq 'export') {
+ if ($manifestok) {
+ while ($currdepth > 0) {
+ print $manifestfile " </item>\n";
+ $currdepth --;
+ }
+ print $manifestfile qq|
+ </organization>
+ </organizations>
+ <resources>
+ $imsresources
+ </resources>
+</manifest>
+ |;
+ close($manifestfile);
+ if ((defined($imsextras)) && ($$imsextras{'caller'} eq 'imsexport')) {
+ $discussion = $copyresult;
+ } else {
+
+#Create zip file in prtspool
+
+ my $imszipfile = '/prtspool/'.
+ $ENV{'user.name'}.'_'.$ENV{'user.domain'}.'_'.
+ time.'_'.rand(1000000000).'.zip';
+ # zip can cause an sh launch which can pass along all of %ENV
+ # which can be too large for /bin/sh to handle
+ my %oldENV=%ENV;
+ undef(%ENV);
+ my $cwd = &getcwd();
+ my $imszip = '/home/httpd/'.$imszipfile;
+ chdir $tempexport;
+ open(OUTPUT, "zip -r $imszip * 2> /dev/null |");
+ close(OUTPUT);
+ chdir $cwd;
+ %ENV=%oldENV;
+ undef(%oldENV);
+ $discussion .= 'Download the zip file from <a href="'.$imszipfile.'">Discussion Posting Archive</a><br />';
+ if ($copyresult) {
+ $discussion .= 'The following errors occurred during export - <br />'.$copyresult;
+ }
+ }
+ } else {
+ $discussion .= '<br />Unfortunately you will not be able to retrieve an archive of the discussion posts at this time, because there was a problem creating a manifest file.<br />';
+ }
+ return $discussion;
+ }
}
if ($discussiononly) {
- $discussion.=(<<ENDDISCUSS);
+ 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 = &Apache::lonnet::unescape($ENV{'form.subject'});
+ $comment = &Apache::lonnet::unescape($ENV{'form.comment'});
+ my @keepold = ();
+ &process_attachments(\@currnewattach,\@currdelold,\@keepold);
+ if (@currnewattach > 0) {
+ $attachnum += @currnewattach;
+ }
+ }
+ if (&discussion_open($status)) {
+ $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 ($outputtarget ne 'tex') {
- $discussion.=&generate_preview_button();
+ 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 {
- if (&discussion_open($status) &&
- &Apache::lonnet::allowed('pch',
- $ENV{'request.course.id'}.
- ($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:''))) {
+ if (&discussion_open($status) &&
+ &Apache::lonnet::allowed('pch',
+ $ENV{'request.course.id'}.
+ ($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:''))) {
if ($outputtarget ne 'tex') {
$discussion.='<table bgcolor="#BBBBBB"><tr><td><a href="/adm/feedback?replydisc='.
- $symb.':::" '.$target.'>'.
- '<img src="/adm/lonMisc/chat.gif" border="0" />'.
+ $ressymb.':::" '.$target.'>'.
+ '<img src="'.&Apache::loncommon::lonhttpdurl('/adm/lonMisc/chat.gif').'" border="0" />'.
&mt('Post Discussion').'</a></td></tr></table>';
}
}
}
- return $discussion;
+ return $discussion;
+}
+
+sub build_posting_display {
+ my ($usernamesort,$subjectsort,$namesort,$notshown,$newitem,$dischash,$shown,$alldiscussion,$imsitems,$imsfiles,$roleinfo,$discussionitems,$replies,$depth,$posters,$maxdepth,$visible,$newpostsflag,$current,$status,$viewgrades,$seeid,$prevread,$sortposts,$ressymb,$target,$readkey,$showunmark,$showonlyunread,$totposters,$rolefilter,$sectionpick,$statusfilter,$toggkey,$outputtarget) = @_;
+ my @original=();
+ my @index=();
+ my $symb=&Apache::lonenc::check_decrypt($ressymb);
+ my %contrib=&Apache::lonnet::restore($symb,$ENV{'request.course.id'},
+ $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+ $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+
+ if ($contrib{'version'}) {
+ my $oldest = $contrib{'1:timestamp'};
+ if ($prevread eq '0') {
+ $prevread = $oldest-1;
+ }
+ my ($skiptest,$rolematch,$roleregexp,$secregexp,$statusregexp);
+ if ($sortposts) {
+ ($skiptest,$roleregexp,$secregexp,$statusregexp) = &filter_regexp($rolefilter,$sectionpick,$statusfilter);
+ $rolematch = $roleregexp.':'.$secregexp.':'.$statusregexp;
+ }
+ 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 $studenthidden=($contrib{'studenthidden'}=~/\.$idx\./);
+ my $deleted=($contrib{'deleted'}=~/\.$idx\./);
+ my $origindex='0.';
+ my $numoldver=0;
+ if ($contrib{$idx.':replyto'}) {
+ if ( (($ENV{'environment.threadeddiscussion'}) && ($sortposts eq '')) || ($sortposts eq 'thread') || ($outputtarget eq 'export')) {
+# 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 {
+ $original[$idx]=0;
+ $$depth[$idx]=0;
+ }
+ } 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++;
+ if ($contrib{$idx.':history'}) {
+ if ($contrib{$idx.':history'} =~ /:/) {
+ my @oldversions = split/:/,$contrib{$idx.':history'};
+ $numoldver = @oldversions;
+ } else {
+ $numoldver = 1;
+ }
+ }
+ $$current = $numoldver;
+ my %messages = ();
+ my %subjects = ();
+ my %attachtxt = ();
+ my %allattachments = ();
+ my ($screenname,$plainname);
+ my $sender = &mt('Anonymous');
+ my ($message,$subject,$vgrlink,$ctlink);
+ &get_post_contents(\%contrib,$idx,$seeid,$outputtarget,\%messages,\%subjects,\%allattachments,\%attachtxt,$imsfiles,\$screenname,\$plainname,$numoldver);
+
+
+# Set up for sorting by subject
+ unless ($outputtarget eq 'export') {
+ $message=$messages{$numoldver};
+ $message.=$attachtxt{$numoldver};
+ $subject=$subjects{$numoldver};
+ if ($message) {
+ if ($hidden) {
+ $message='<font color="#888888">'.$message.'</font>';
+ if ($studenthidden) {
+ $message .='<br /><br />Deleted by poster (student).';
+ }
+ }
+
+ if ($subject eq '') {
+ if (defined($$subjectsort{'__No subject'})) {
+ push @{$$subjectsort{'__No subject'}}, $idx;
+ } else {
+ @{$$subjectsort{'__No subject'}} = ("$idx");
+ }
+ } else {
+ if (defined($$subjectsort{$subject})) {
+ push @{$$subjectsort{$subject}}, $idx;
+ } else {
+ @{$$subjectsort{$subject}} = ("$idx");
+ }
+ }
+ 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;
+ }
+
+# Set up for sorting by domain, then username
+ unless (defined($$usernamesort{$contrib{$idx.':senderdomain'}})) {
+ %{$$usernamesort{$contrib{$idx.':senderdomain'}}} = ();
+ }
+ if (defined($$usernamesort{$contrib{$idx.':senderdomain'}}{$contrib{$idx.':sendername'}})) {
+ push @{$$usernamesort{$contrib{$idx.':senderdomain'}}{$contrib{$idx.':sendername'}}}, $idx;
+ } else {
+ @{$$usernamesort{$contrib{$idx.':senderdomain'}}{$contrib{$idx.':sendername'}}} = ("$idx");
+ }
+# Set up for sorting by last name, then first name
+ my %names = &Apache::lonnet::get('environment',
+ ['firstname','lastname'],$contrib{$idx.':senderdomain'},
+ ,$contrib{$idx.':sendername'});
+ my $lastname = $names{'lastname'};
+ my $firstname = $names{'firstname'};
+ if ($lastname eq '') {
+ $lastname = '_';
+ }
+ if ($firstname eq '') {
+ $firstname = '_';
+ }
+ unless (defined($$namesort{$lastname})) {
+ %{$$namesort{$lastname}} = ();
+ }
+ if (defined($$namesort{$lastname}{$firstname})) {
+ push @{$$namesort{$lastname}{$firstname}}, $idx;
+ } else {
+ @{$$namesort{$lastname}{$firstname}} = ("$idx");
+ }
+ if ($ENV{'course.'.$ENV{'request.course.id'}.'.allow_discussion_post_editing'} =~ m/yes/i) {
+ if (($ENV{'user.domain'} eq $contrib{$idx.':senderdomain'}) && ($ENV{'user.name'} eq $contrib{$idx.':sendername'})) {
+ $sender.=' <a href="/adm/feedback?editdisc='.
+ $ressymb.':::'.$idx;
+ if ($newpostsflag) {
+ $sender .= '&previous='.$prevread;
+ }
+ $sender .= '" '.$target.'>'.&mt('Edit').'</a>';
+ unless ($seeid) {
+ $sender.=" <a href=\"javascript:studentdelete('$ressymb','$idx','$newpostsflag','$prevread')";
+ $sender .= '">'.&mt('Delete').'</a>';
+ }
+ }
+ }
+ if ($seeid) {
+ if ($hidden) {
+ unless ($studenthidden) {
+ $sender.=' <a href="/adm/feedback?unhide='.
+ $ressymb.':::'.$idx;
+ if ($newpostsflag) {
+ $sender .= '&previous='.$prevread;
+ }
+ $sender .= '">'.&mt('Make Visible').'</a>';
+ }
+ } else {
+ $sender.=' <a href="/adm/feedback?hide='.
+ $ressymb.':::'.$idx;
+ if ($newpostsflag) {
+ $sender .= '&previous='.$prevread;
+ }
+ $sender .= '">'.&mt('Hide').'</a>';
+ }
+ $sender.=' <a href="/adm/feedback?deldisc='.
+ $ressymb.':::'.$idx;
+ if ($newpostsflag) {
+ $sender .= '&previous='.$prevread;
+ }
+ $sender .= '">'.&mt('Delete').'</a>';
+ }
+ } else {
+ if ($screenname) {
+ $sender='<i>'.$screenname.'</i>';
+ }
+# Set up for sorting by domain, then username for anonymous
+ unless (defined($$usernamesort{'__anon'})) {
+ %{$$usernamesort{'__anon'}} = ();
+ }
+ if (defined($$usernamesort{'__anon'}{'__anon'})) {
+ push @{$$usernamesort{'__anon'}{'__anon'}}, $idx;
+ } else {
+ @{$$usernamesort{'__anon'}{'__anon'}} = ("$idx");
+ }
+# Set up for sorting by last name, then first name for anonymous
+ unless (defined($$namesort{'__anon'})) {
+ %{$$namesort{'__anon'}} = ();
+ }
+ if (defined($$namesort{'__anon'}{'__anon'})) {
+ push @{$$namesort{'__anon'}{'__anon'}}, $idx;
+ } else {
+ @{$$namesort{'__anon'}{'__anon'}} = ("$idx");
+ }
+ }
+ 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;
+ if ($newpostsflag) {
+ $sender .= '&previous='.$prevread;
+ }
+ $sender .= '" '.$target.'>'.&mt('Reply').'</a>';
+ }
+ if ($viewgrades) {
+ $vgrlink=&Apache::loncommon::submlink('Submissions',
+ $contrib{$idx.':sendername'},$contrib{$idx.':senderdomain'},$ressymb);
+ }
+ if ($$dischash{$readkey}=~/\.$idx\./) {
+ $ctlink = '<label><b>'.&mt('Mark unread').'?</b> <input type="checkbox" name="postunread_'.$idx.'" /></label>';
+ } else {
+ $ctlink = '<label><b>'.&mt('Mark read').'?</b> <input type="checkbox" name="postread_'.$idx.'" /></label>';
+ }
+ }
+#figure out at what position this needs to print
+ }
+ if ($outputtarget eq 'export' || $message) {
+ my $thisindex=$idx;
+ if ( (($ENV{'environment.threadeddiscussion'}) && ($sortposts eq '')) || ($sortposts eq 'thread') || ($outputtarget eq 'export')) {
+ $thisindex=$origindex.substr('00'.$$replies[$$depth[$idx]],-2,2);
+ }
+ $$alldiscussion{$thisindex}=$idx;
+ $$shown{$idx} = 0;
+ $index[$idx]=$thisindex;
+ }
+ if ($outputtarget eq 'export') {
+ %{$$imsitems{$idx}} = ();
+ $$imsitems{$idx}{'isvisible'}='true';
+ if ($hidden) {
+ $$imsitems{$idx}{'isvisible'}='false';
+ }
+ $$imsitems{$idx}{'title'}=$subjects{$numoldver};
+ $$imsitems{$idx}{'message'}=$messages{$numoldver};
+ $$imsitems{$idx}{'attach'}=$attachtxt{$numoldver};
+ $$imsitems{$idx}{'timestamp'}=$contrib{$idx.':timestamp'};
+ $$imsitems{$idx}{'sender'}=$plainname.' ('.
+ $contrib{$idx.':sendername'}.' at '.
+ $contrib{$idx.':senderdomain'}.')';
+ $$imsitems{$idx}{'isanonymous'}='false';
+ if ($contrib{$idx.':anonymous'}) {
+ $$imsitems{$idx}{'isanonymous'}='true';
+ }
+ $$imsitems{$idx}{'currversion'}=$numoldver;
+ %{$$imsitems{$idx}{'allattachments'}}=%allattachments;
+ unless ($messages{$numoldver} eq '' && $attachtxt{$numoldver} eq '') {
+ $$shown{$idx} = 1;
+ }
+ } else {
+ if ($message) {
+ 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;
+ if (defined($ENV{'form.totposters'})) {
+ if ($totposters == 0) {
+ $$shown{$idx} = 0;
+ } elsif ($totposters > 0) {
+ if (grep/^$poster$/,@{$posters}) {
+ $$shown{$idx} = 1;
+ }
+ }
+ } elsif ($sortposts) {
+ if ($skiptest) {
+ $$shown{$idx} = 1;
+ } else {
+ foreach my $role (@{$$roleinfo{$poster}}) {
+ if ($role =~ /^cc:/) {
+ my $cc_regexp = $roleregexp.':[^:]*:'.$statusregexp;
+ if ($role =~ /$cc_regexp/) {
+ $$shown{$idx} = 1;
+ last;
+ }
+ } elsif ($role =~ /^$rolematch$/) {
+ $$shown{$idx} = 1;
+ last;
+ }
+ }
+ }
+ } else {
+ $$shown{$idx} = 1;
+ }
+ }
+ unless ($$notshown{$idx} == 1) {
+ 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.' ('.
+ &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] .= &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 {
+ @postversions = ("$contrib{$idx.':history'}");
+ }
+ for (my $i=0; $i<@postversions; $i++) {
+ my $version = $i+1;
+ $$discussionitems[$idx] .= '<b>'.$version.'.</b> - '.&Apache::lonlocal::locallocaltime($postversions[$i]).' ';
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+}
+
+sub filter_regexp {
+ my ($rolefilter,$sectionpick,$statusfilter) = @_;
+ my ($roleregexp,$secregexp,$statusregexp);
+ my $skiptest = 1;
+ if (@{$rolefilter} > 0) {
+ my @okrolefilter = ();
+ foreach (@{$rolefilter}) {
+ unless ($_ eq '') {
+ push @okrolefilter, $_;
+ }
+ }
+ if (@okrolefilter > 0) {
+ if (grep/^all$/,@okrolefilter) {
+ $roleregexp='[^:]+';
+ } else {
+ if (@okrolefilter == 1) {
+ $roleregexp=$okrolefilter[0];
+ } else {
+ $roleregexp='('.join('|',@okrolefilter).')';
+ }
+ $skiptest = 0;
+ }
+ }
+ }
+ if (@{$sectionpick} > 0) {
+ my @oksectionpick = ();
+ foreach (@{$sectionpick}) {
+ unless ($_ eq '') {
+ push @oksectionpick, $_;
+ }
+ }
+ if ((@oksectionpick > 0) && (!grep/^all$/,@oksectionpick)) {
+ if (@oksectionpick == 1) {
+ $secregexp = $oksectionpick[0];
+ } else {
+ $secregexp .= '('.join('|',@oksectionpick).')';
+ }
+ $skiptest = 0;
+ } else {
+ $secregexp .= '[^:]*';
+ }
+ }
+ if (defined($statusfilter) && $statusfilter ne '') {
+ if ($statusfilter eq 'all') {
+ $statusregexp = '[^:]+';
+ } else {
+ $statusregexp = $statusfilter;
+ $skiptest = 0;
+ }
+ }
+ return ($skiptest,$roleregexp,$secregexp,$statusregexp);
+}
+
+
+sub get_post_contents {
+ my ($contrib,$idx,$seeid,$type,$messages,$subjects,$allattachments,$attachtxt,$imsfiles,$screenname,$plainname,$numver) = @_;
+ my $discussion = '';
+ my $start=$numver;
+ my $end=$numver + 1;
+ %{$$imsfiles{$idx}}=();
+ if ($type eq 'allversions') {
+ unless($seeid) {
+ $discussion=&mt('You do not have privileges to view all versions of posts.').&mt('Please select a different role');
+ return $discussion;
+ }
+ }
+# $$screenname=&Apache::loncommon::screenname(
+# $$contrib{$idx.':sendername'},
+# $$contrib{$idx.':senderdomain'});
+# $$plainname=&Apache::loncommon::nickname(
+# $$contrib{$idx.':sendername'},
+# $$contrib{$idx.':senderdomain'});
+ ($$screenname,$$plainname)=($$contrib{$idx.':screenname'},
+ $$contrib{$idx.':plainname'});
+ my $sender=&Apache::loncommon::aboutmewrapper(
+ $$plainname,
+ $$contrib{$idx.':sendername'},
+ $$contrib{$idx.':senderdomain'}).' ('.
+ $$contrib{$idx.':sendername'}.' at '.
+ $$contrib{$idx.':senderdomain'}.')';
+ my $attachmenturls = $$contrib{$idx.':attachmenturl'};
+ my @postversions = ();
+ if ($type eq 'allversions' || $type eq 'export') {
+ $start = 0;
+ if ($$contrib{$idx.':history'}) {
+ if ($$contrib{$idx.':history'} =~ m/:/) {
+ @postversions = split/:/,$$contrib{$idx.':history'};
+ } else {
+ @postversions = ("$$contrib{$idx.':history'}");
+ }
+ }
+ &get_post_versions($messages,$$contrib{$idx.':message'},1);
+ &get_post_versions($subjects,$$contrib{$idx.':subject'},1);
+ push @postversions,$$contrib{$idx.':timestamp'};
+ $end = @postversions;
+ } else {
+ &get_post_versions($messages,$$contrib{$idx.':message'},1,$numver);
+ &get_post_versions($subjects,$$contrib{$idx.':subject'},1,$numver);
+ }
+
+ if ($$contrib{$idx.':anonymous'}) {
+ $sender.=' ['.&mt('anonymous').'] '.$$screenname;
+ }
+ if ($type eq 'allversions') {
+ $discussion=('<b>'.$sender.'</b><br /><ul>');
+ }
+ for (my $i=$start; $i<$end; $i++) {
+ my ($timesent,$attachmsg);
+ my %currattach = ();
+ $timesent = &Apache::lonlocal::locallocaltime($postversions[$i]);
+ $$messages{$i}=~s/\n/\<br \/\>/g;
+ $$messages{$i}=&Apache::lontexconvert::msgtexconverted($$messages{$i});
+ $$subjects{$i}=~s/\n/\<br \/\>/g;
+ $$subjects{$i}=&Apache::lontexconvert::msgtexconverted($$subjects{$i});
+ if ($attachmenturls) {
+ &extract_attachments($attachmenturls,$idx,$i,\$attachmsg,$allattachments,\%currattach);
+ }
+ if ($type eq 'export') {
+ $$imsfiles{$idx}{$i} = '';
+ if ($attachmsg) {
+ $$attachtxt{$i} = '<br />Attachments:<br />';
+ foreach (sort keys %currattach) {
+ if ($$allattachments{$_}{'filename'} =~ m-^/uploaded/([^/]+/[^/]+)(/feedback)?(/?\d*)/([^/]+)$-) {
+ my $fname = $1.$3.'/'.$4;
+ $$imsfiles{$idx}{$i} .= '<file href="'.$fname.'">'."\n";
+ $$attachtxt{$i}.= '<a href="'.$fname.'">'.$4.'</a><br />';
+ }
+ }
+ }
+ } else {
+ if ($attachmsg) {
+ $$attachtxt{$i} = '<br />Attachments:'.$attachmsg.'<br />';
+ } else {
+ $$attachtxt{$i} = '';
+ }
+ }
+ if ($type eq 'allversions') {
+ $discussion.= <<"END";
+<li><b>$$subjects{$i}</b>, $timesent<br />
+$$messages{$i}<br />
+$$attachtxt{$i}</li>
+END
+ }
+ }
+ if ($type eq 'allversions') {
+ $discussion.=('</ul></body></html>');
+ return $discussion;
+ } else {
+ return;
+ }
+}
+
+sub replicate_attachments {
+ my ($attachrefs,$tempexport) = @_;
+ my $response;
+ foreach my $id (keys %{$attachrefs}) {
+ if ($$attachrefs{$id}{'filename'} =~ m-^/uploaded/([^/]+)/([^/]+)(/feedback)?(/?\d*)/([^/]+)$-) {
+ my $path = $tempexport;
+ my $tail = $1.'/'.$2.$4;
+ my @extras = split/\//,$tail;
+ my $destination = $tempexport.'/'.$1.'/'.$2.$4.'/'.$5;
+ if (!-e $destination) {
+ my $i= 0;
+ while ($i<@extras) {
+ $path .= '/'.$extras[$i];
+ if (!-e $path) {
+ mkdir($path,0700);
+ }
+ $i ++;
+ }
+ my ($content,$rtncode);
+ my $uploadreply = &Apache::lonnet::getuploaded('GET',$$attachrefs{$id}{'filename'},$1,$2,$content,$rtncode);
+ if ($uploadreply eq 'ok') {
+ my $attachcopy;
+ if ($attachcopy = Apache::File->new('>'.$destination)) {
+ print $attachcopy $content;
+ close($attachcopy);
+ } else {
+ $response .= 'Error copying file attachment - '.$5.' to IMS package: '.$!.'<br />'."\n";
+ }
+ } else {
+ &Apache::lonnet::logthis("Replication of attachment failed when building IMS export of discussion posts - domain: $1, course: $2, file: $$attachrefs{$id}{'filename'} -error: $rtncode");
+ $response .= 'Error copying file attachment - '.$5.' to IMS package: '.$rtncode.'<br />'."\n";
+ }
+ }
+ }
+ }
+ return $response;
}
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 {
@@ -803,8 +1357,15 @@ END
$ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
$ENV{'course.'.$ENV{'request.course.id'}.'.num'});
unless (($contrib{'hidden'}=~/\.$idx\./) || ($contrib{'deleted'}=~/\.$idx\./)) {
+ if ($contrib{$idx.':history'}) {
+ if ($contrib{$idx.':history'} =~ /:/) {
+ my @oldversions = split/:/,$contrib{$idx.':history'};
+ $numoldver = @oldversions;
+ } else {
+ $numoldver = 1;
+ }
+ }
if ($ENV{'form.replydisc'}) {
- my $numoldver = 0;
if ($contrib{$idx.':history'}) {
if ($contrib{$idx.':history'} =~ /:/) {
my @oldversions = split/:/,$contrib{$idx.':history'};
@@ -813,37 +1374,39 @@ END
$numoldver = 1;
}
}
- my $message=$contrib{$idx.':message'};
+ my $message;
+ if ($idx > 0) {
+ my %msgversions = ();
+ &get_post_versions(\%msgversions,$contrib{$idx.':message'},0,$numoldver);
+ $message = $msgversions{$numoldver};
+ }
$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) {
- $subject = $1;
- } else {
- $subject = $contrib{$idx.':subject'};
- }
- $subject = 'Re: '.$subject;
+ my %subversions = ();
+ &get_post_versions(\%subversions,$contrib{$idx.':subject'},1,$numoldver);
+ $subject = 'Re: '.$subversions{$numoldver};
}
+ $subject = &HTML::Entities::encode($subject,'<>&"');
} else {
- if ($contrib{$idx.':message'} =~ /::::\d+::::(.+)$/si) {
- $oldmessage = $1;
- } else {
- $oldmessage = $contrib{$idx.':message'};
- }
- $oldmessage=&HTML::Entities::encode($oldmessage,'<>&"');
- if ($contrib{$idx.':subject'} =~ /::::\d+::::(.+)$/si) {
- $subject = $1;
- } else {
- $subject = $contrib{$idx.':subject'};
+ $attachmenturls = $contrib{$idx.':attachmenturl'};
+ if ($idx > 0) {
+ my %msgversions = ();
+ &get_post_versions(\%msgversions,$contrib{$idx.':message'},0,$numoldver);
+ $comment = $msgversions{$numoldver};
+ my %subversions = ();
+ &get_post_versions(\%subversions,$contrib{$idx.':subject'},0,$numoldver);
+ $subject = $subversions{$numoldver};
}
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,18 +1420,28 @@ END
return
}
END
+ }
}
}
if ($ENV{'form.previous'}) {
$prevtag = '<input type="hidden" name="previous" value="'.$ENV{'form.previous'}.'" />';
}
}
+
+ if ($ENV{'form.origpage'}) {
+ $subject = &Apache::lonnet::unescape($ENV{'form.subject'});
+ $comment = &Apache::lonnet::unescape($ENV{'form.comment'});
+ &process_attachments(\@currnewattach,\@currdelold,\@keepold);
+ }
my $latexHelp=&Apache::loncommon::helpLatexCheatsheet();
my $htmlheader=&Apache::lonhtmlcommon::htmlareaheaders();
my $send=&mt('Send');
+ my $html=&Apache::lonxml::xmlbegin();
+ my $encoding=&Apache::lonxml::fontsettings();
$r->print(<<END);
-<html>
+$html
<head>
+$encoding
<title>The LearningOnline Network with CAPA</title>
<meta http-equiv="pragma" content="no-cache"></meta>
$htmlheader
@@ -908,7 +1481,7 @@ $htmlheader
}
if (rec) {
- if (typeof(document.mailform.onsubmit)!='undefined') {
+ if (typeof(document.mailform.onsubmit)=='function') {
document.mailform.onsubmit();
}
document.mailform.submit();
@@ -916,6 +1489,7 @@ $htmlheader
alert('Please check a feedback type.');
}
}
+ $anonchk
$anonscript
//-->
</script>
@@ -937,7 +1511,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,28 +1520,84 @@ $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) = @_;
- # backward compatibility (bulletin boards used to be 'wrapped')
- if ($feedurl=~m|^/adm/wrapper/adm/.*/bulletinboard$|) {
- $feedurl=~s|^/adm/wrapper||;
- }
+ my ($r,$symb,$previous,$dispchgA,$dispchgB,$markchg,$toggchg,$feedurl) = @_;
+ &Apache::loncommon::content_type($r,'text/html');
+ $r->send_http_header;
my $function = &Apache::loncommon::get_users_function();
my $tabcolor = &Apache::loncommon::designparm($function.'.tabbg',
@@ -983,54 +1613,119 @@ 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';
+ }
+ my $html=&Apache::lonxml::xmlbegin();
+ my $encoding=&Apache::lonxml::fontsettings();
$r->print(<<END);
-<html>
+$html
<head>
+$encoding
<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 +1742,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 +1759,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><label><input type="checkbox" name="discdisp" onClick="discdispChk('0')" /> $lt{'chgt'} "$dispchangeA"</label>
+ <br />
+ <label><input type="checkbox" name="discdisp" onClick="discdispChk('1')" /> $lt{'chgt'} "$dispchangeB"</label>
+ </td>
</tr><tr bgcolor="#eeeeee">
<td>$lt{'npmr'}</td>
<td>$lt{$discmark}</td>
- <td><input type="checkbox" name="discmark" />$lt{'chgt'} "$markchange"</td>
+ <td><label><input type="checkbox" name="discmark" />$lt{'chgt'} "$markchange"</label></td>
+ </tr><tr bgcolor="#dddddd">
+ <td>$lt{'dotm'}</td>
+ <td>$lt{$disctogg}</td>
+ <td><label><input type="checkbox" name="disctogg" onClick="discdispChk('2')" />$lt{'chgt'} "$toggchange"</label></td>
</tr>
</table>
</td>
@@ -1079,9 +1781,12 @@ $lt{'sdpf'}<br/> $lt{'prca'} <ol><li>$l
</table>
<br />
<br />
+<input type="hidden" name="symb" value="$symb" />
<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 />
@@ -1094,38 +1799,22 @@ END
sub print_sortfilter_options {
my ($r,$symb,$previous,$feedurl) = @_;
- # backward compatibility (bulletin boards used to be 'wrapped')
- if ($feedurl=~m|^/adm/wrapper/adm/.*/bulletinboard$|) {
- $feedurl=~s|^/adm/wrapper||;
- }
+
+ &Apache::loncommon::content_type($r,'text/html');
+ $r->send_http_header;
+
+ &Apache::lonenc::check_encrypt(\$symb);
my @sections = ();
my $section_sel = '';
my $numsections = 0;
my $numvisible = 5;
- my ($classlist) = &Apache::loncoursedata::get_classlist(
- $ENV{'request.course.id'},
- $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
- $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
-
- my $sec_index = &Apache::loncoursedata::CL_SECTION();
- my $status_index = &Apache::loncoursedata::CL_STATUS();
my %sectioncount = ();
- while (my ($student,$data) = each %$classlist) {
- my ($section,$status) = ($data->[$sec_index],
- $data->[$status_index]);
- unless ($section eq '' || $section =~ /^\s*$/) {
- if (!defined($sectioncount{$section})) {
- $sectioncount{$section} = 1;
- $numsections ++;
- } else {
- $sectioncount{$section} ++;
- }
- }
- }
-
- if ($ENV{'request.course.sec'} !~ /^\s*$/) {
- @sections = ($ENV{'request.course.sec'});
- $numvisible = 1;
+
+ $numsections = &Apache::loncommon::get_sections($ENV{'course.'.$ENV{'request.course.id'}.'.domain'},$ENV{'course.'.$ENV{'request.course.id'}.'.num'},\%sectioncount);
+
+ if ($ENV{'request.course.sec'} !~ /^\s*$/) { #Restrict section choice to current section
+ @sections = ('all',$ENV{'request.course.sec'});
+ $numvisible = 2;
} else {
@sections = sort {$a cmp $b} keys(%sectioncount);
unshift(@sections,'all'); # Put 'all' at the front of the list
@@ -1147,19 +1836,51 @@ sub print_sortfilter_options {
'diop' => 'Display Options',
'curr' => 'Current setting ',
'actn' => 'Action',
- 'prca' => 'Options can be set that control the sort order of the posts, in addition to which posts are displayed.',
+ 'prca' => 'Set options that control the sort order of posts, and/or which posts are displayed.',
'soor' => 'Sort order',
- 'disp' => 'Specific user roles',
- 'actv' => 'Specific role status',
+ 'spur' => 'Specific user roles',
+ 'sprs' => 'Specific role status',
'spse' => 'Specific sections',
'psub' => 'Pick specific users (by name)',
'shal' => 'Show a list of current posters'
);
+
+ my %sort_types = ();
+ my %role_types = ();
+ my %status_types = ();
+ &sort_filter_names(\%sort_types,\%role_types,\%status_types);
+ my $html=&Apache::lonxml::xmlbegin();
+ my $encoding=&Apache::lonxml::fontsettings();
$r->print(<<END);
-<html>
+$html
<head>
+$encoding
<title>$lt{'diso'}</title>
<meta http-equiv="pragma" content="no-cache" />
+<script type="text/javascript">
+function verifyFilter() {
+ var rolenum = 0
+ for (var i=0; i<document.modifyshown.rolefilter.length; i++) {
+ if (document.modifyshown.rolefilter.options[i].selected == true) {
+ rolenum ++
+ }
+ }
+ if (rolenum == 0) {
+ document.modifyshown.rolefilter.options[0].selected = true
+ }
+
+ var secnum = 0
+ for (var i=0; i<document.modifyshown.sectionpick.length; i++) {
+ if (document.modifyshown.sectionpick.options[i].selected == true) {
+ secnum ++
+ }
+ }
+ if (secnum == 0) {
+ document.modifyshown.sectionpick.options[0].selected = true
+ }
+ document.modifyshown.submit();
+}
+</script>
</head>
$bodytag
<form name="modifyshown" method="post" action="/adm/feedback">
@@ -1169,60 +1890,61 @@ $bodytag
<tr>
<td><b>$lt{'soor'}</b></td>
<td> </td>
- <td><b>$lt{'disp'}</b></td>
+ <td><b>$lt{'sprs'}</b></td>
<td> </td>
- <td><b>$lt{'actv'}</b></td>
+ <td><b>$lt{'spur'}</b></td>
<td> </td>
<td><b>$lt{'spse'}</b></td>
<td> </td>
<td><b>$lt{'psub'}</b></td>
</tr>
<tr>
- <td>
+ <td align="center">
<select name="sortposts">
- <option value="ascdate" />Date order - oldest first
- <option value="descdate" />Date order - newest first
- <option value="thread" />Threaded
- <option value="subject" />By subject
- <option value="username" />By domain and username
- <option value="lastfirst" />By last name, first name
+ <option value="ascdate" selected="selected" />$sort_types{'ascdate'}
+ <option value="descdate" />$sort_types{'descdate'}
+ <option value="thread" />$sort_types{'thread'}
+ <option value="subject" />$sort_types{'subject'}
+ <option value="username" />$sort_types{'username'}
+ <option value="lastfirst" />$sort_types{'lastfirst'}
</select>
</td>
<td> </td>
- <td>
- <select name="rolefilter" multiple="true" size="5">
- <option value="all" />All users
- <option value="st" />Students
- <option value="cc" />Course Coordinators
- <option value="in" />Instructors
- <option value="ta" />TAs
- <option value="pr" />Exam proctors
- <option value="cr" />Custom roles
+ <td align="center">
+ <select name="statusfilter">
+ <option value="all" selected="selected" />$status_types{'all'}
+ <option value="Active" />$status_types{'Active'}
+ <option value="Expired" />$status_types{'Expired'}
</select>
</td>
<td> </td>
- <td>
- <select name="statusfilter">
- <option value="all" />Roles of any status
- <option value="Active" />Only active roles
- <option value="Expired" />Only inactive roles
+ <td align="center">
+ <select name="rolefilter" multiple="true" size="5">
+ <option value="all" />$role_types{'all'}
+ <option value="st" />$role_types{'st'}
+ <option value="cc" />$role_types{'cc'}
+ <option value="in" />$role_types{'in'}
+ <option value="ta" />$role_types{'ta'}
+ <option value="ep" />$role_types{'ep'}
+ <option value="ad" />$role_types{'ad'}
+ <option value="cr" />$role_types{'cr'}
</select>
</td>
<td> </td>
- <td>
+ <td align="center">
<select name="sectionpick" multiple="true" size="$numvisible">
$section_sel
</select>
</td>
<td> </td>
- <td><input type="checkbox" name="posterlist" value="$symb" />$lt{'shal'}</td>
+ <td><label><input type="checkbox" name="posterlist" value="$symb" />$lt{'shal'}</label></td>
</tr>
</table>
<br />
<br />
<input type="hidden" name="previous" value="$previous" />
<input type="hidden" name="applysort" value="$symb" />
-<input type="button" name="sub" value="Store Changes" onClick="javascript:document.modifyshown.submit()" />
+<input type="button" name="sub" value="Store Changes" onClick="verifyFilter()" />
<br />
<br />
</form>
@@ -1233,24 +1955,15 @@ END
sub print_showposters {
my ($r,$symb,$previous,$feedurl,$sortposts) = @_;
- # backward compatibility (bulletin boards used to be 'wrapped')
- if ($feedurl=~m|^/adm/wrapper/adm/.*/bulletinboard$|) {
- $feedurl=~s|^/adm/wrapper||;
- }
-# backward compatibility (bulletin boards used to be 'wrapped')
- my $ressymb=$symb;
- if ($ressymb =~ /bulletin___\d+___/) {
- unless ($ressymb =~ m|bulletin___\d+___adm/wrapper|) {
- $ressymb=~s|(bulletin___\d+___)|$1adm/wrapper|;
- }
- }
+
+ &Apache::lonenc::check_encrypt(\$symb);
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 %contrib=&Apache::lonnet::restore($ressymb,$ENV{'request.course.id'},
+ my %contrib=&Apache::lonnet::restore($symb,$ENV{'request.course.id'},
$ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
$ENV{'course.'.$ENV{'request.course.id'}.'.num'});
my %namesort = ();
@@ -1291,9 +2004,12 @@ sub print_showposters {
}
}
}
+ my $html=&Apache::lonxml::xmlbegin();
+ my $encoding=&Apache::lonxml::fontsettings();
$r->print(<<END);
-<html>
+$html
<head>
+$encoding
<title>$lt{'diso'}</title>
<meta http-equiv="pragma" content="no-cache" />
</head>
@@ -1319,7 +2035,7 @@ END
next;
} else {
$count ++;
- $r->print('<tr bgcolor="#ffffe6"><td align="right">'.$count.'</td><td align="center"><input name="stuinfo" type="checkbox" value="'.$_.'" /></td><td>'.$last.', '.$first.' ('.$uname.','.$udom.')</td><td>'.$postcounts{$_}.'</td></tr>');
+ $r->print('<tr bgcolor="#ffffe6"><td align="right">'.$count.'</td><td align="center"><label><input name="stuinfo" type="checkbox" value="'.$_.'" /></td><td>'.$last.', '.$first.' ('.$uname.','.$udom.')</label></td><td>'.$postcounts{$_}.'</td></tr>');
}
}
}
@@ -1339,25 +2055,92 @@ END
END
}
+sub get_post_versions {
+ my ($versions,$incoming,$htmldecode,$numver) = @_;
+ if ($incoming =~ /^<version num="0">/) {
+ my $p = HTML::LCParser->new(\$incoming);
+ my $done = 0;
+ while ( (my $token = $p->get_tag("version")) && (!$done)) {
+ my $num = $token->[1]{num};
+ my $text = $p->get_text("/version");
+ if (defined($numver)) {
+ if ($num == $numver) {
+ if ($htmldecode) {
+ $text = &HTML::Entities::decode($text);
+ }
+ $$versions{$numver}=$text;
+ $done = 1;
+ }
+ } else {
+ if ($htmldecode) {
+ $text = &HTML::Entities::decode($text);
+ }
+ $$versions{$num}=$text;
+ }
+ }
+ } else {
+ if (!defined($numver)) {
+ $numver = 0;
+ }
+ if ($htmldecode) {
+ $$versions{$numver} = $incoming;
+ } else {
+ $$versions{$numver} = &HTML::Entities::encode($incoming,'<>&"');
+ }
+ }
+ return;
+}
+
+sub get_post_attachments {
+ my ($attachments,$attachmenturls) = @_;
+ my $num;
+ if ($attachmenturls =~ m/^<attachment id="0">/) {
+ my $p = HTML::LCParser->new(\$attachmenturls);
+ while (my $token = $p->get_tag("attachment","filename","post")) {
+ if ($token->[0] eq "attachment") {
+ $num = $token->[1]{id};
+ %{$$attachments{$num}} =();
+ } elsif ($token->[0] eq "filename") {
+ $$attachments{$num}{'filename'} = $p->get_text("/filename");
+ } elsif ($token->[0] eq "post") {
+ my $id = $token->[1]{id};
+ $$attachments{$num}{$id} = $p->get_text("/post");
+ }
+ }
+ } else {
+ %{$$attachments{'0'}} = ();
+ $$attachments{'0'}{'filename'} = $attachmenturls;
+ $$attachments{'0'}{'0'} = 'n';
+ }
+
+ return;
+}
+
sub fail_redirect {
my ($r,$feedurl) = @_;
if ($feedurl=~/^\/adm\//) { $feedurl.='?register=1' };
+ my $logo=&Apache::loncommon::lonhttpdurl('/adm/lonIcons/lonlogos.gif');
+ my $html=&Apache::lonxml::xmlbegin();
+ my $encoding=&Apache::lonxml::fontsettings();
$r->print (<<ENDFAILREDIR);
-<html>
-<head><title>Feedback not sent</title>
+$html
+<head>
+$encoding
+<title>Feedback not sent</title>
<meta http-equiv="pragma" content="no-cache" />
<meta HTTP-EQUIV="Refresh" CONTENT="2; url=$feedurl" />
</head>
<body bgcolor="#FFFFFF">
-<img align="right" src="/adm/lonIcons/lonlogos.gif" />
+<img align="right" src="$logo" />
<b>Sorry, no recipients ...</b>
+<br /><a href="$feedurl">Continue</a>
</body>
</html>
ENDFAILREDIR
}
sub redirect_back {
- my ($r,$feedurl,$typestyle,$sendsomething,$sendposts,$status,$previous,$sort,$rolefilter,$statusfilter,$secpick,$numpicks) = @_;
+ my ($r,$feedurl,$typestyle,$sendsomething,$sendposts,$status,$previous,$sort,$rolefilter,$statusfilter,$sectionpick,$numpicks) = @_;
my $sorttag = '';
my $roletag = '';
my $statustag = '';
@@ -1365,10 +2148,11 @@ sub redirect_back {
my $userpicktag = '';
my $qrystr = '';
my $prevtag = '';
- # backward compatibility (bulletin boards used to be 'wrapped')
- if ($feedurl=~m|^/adm/wrapper/adm/.*/bulletinboard$|) {
- $feedurl=~s|^/adm/wrapper||;
- }
+
+ &Apache::loncommon::content_type($r,'text/html');
+ $r->send_http_header;
+
+ &dewrapper(\$feedurl);
if ($feedurl=~/^\/adm\//) { $feedurl.='?register=1' };
if ($previous > 0) {
$qrystr = 'previous='.$previous;
@@ -1387,29 +2171,57 @@ sub redirect_back {
$feedurl .= '?'.$sortqry;
}
$sorttag = '<input type="hidden" name="sortposts" value="'.$sort.'" />';
- if ( (defined($numpicks)) && ($numpicks > 0) ) {
+ if (defined($numpicks)) {
my $userpickqry = 'totposters='.$numpicks;
$feedurl .= '&'.$userpickqry;
$userpicktag = '<input type="hidden" name="totposters" value="'.$numpicks.'" />';
} else {
- my $roleqry = 'rolefilter='.$rolefilter;
- $feedurl .= '&'.$roleqry;
- $roletag = '<input type="hidden" name="rolefilter" value="'.$rolefilter.'" />';
+ if (ref($sectionpick) eq 'ARRAY') {
+ $feedurl .= '§ionpick=';
+ $sectag .= '<input type="hidden" name="sectionpick" value="';
+ foreach (@{$sectionpick}) {
+ $feedurl .= $_.',';
+ $sectag .= $_.',';
+ }
+ $feedurl =~ s/,$//;
+ $sectag =~ s/,$//;
+ $sectag .= '" />';
+ } else {
+ $feedurl .= '§ionpick='.$sectionpick;
+ $sectag = '<input type="hidden" name="sectionpick" value="'.$sectionpick.'" />';
+ }
+ if (ref($rolefilter) eq 'ARRAY') {
+ $feedurl .= '&rolefilter=';
+ $roletag .= '<input type="hidden" name="rolefilter" value="';
+ foreach (@{$rolefilter}) {
+ $feedurl .= $_.',';
+ $roletag .= $_.',';
+ }
+ $feedurl =~ s/,$//;
+ $roletag =~ s/,$//;
+ $roletag .= '" />';
+ } else {
+ $feedurl .= '&rolefilter='.$rolefilter;
+ $roletag = '<input type="hidden" name="rolefilter" value="'.$rolefilter.'" />';
+ }
$feedurl .= '&statusfilter='.$statusfilter;
$statustag ='<input type="hidden" name="statusfilter" value="'.$statusfilter.'" />';
- $feedurl .= '§ionpick='.$secpick;
- $sectag = '<input type="hidden" name="sectionpick" value="'.$secpick.'" />';
}
}
+ $feedurl=&Apache::lonenc::check_encrypt($feedurl);
+ my $logo=&Apache::loncommon::lonhttpdurl('/adm/lonIcons/lonlogos.gif');
+ my $html=&Apache::lonxml::xmlbegin();
+ my $encoding=&Apache::lonxml::fontsettings();
$r->print (<<ENDREDIR);
-<html>
+$html
<head>
+$encoding
<title>Feedback sent</title>
<meta http-equiv="pragma" content="no-cache" />
<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" />
+<img align="right" src="$logo" />
$typestyle
<b>Sent $sendsomething message(s), and $sendposts post(s).</b>
<font color="red">$status</font>
@@ -1421,6 +2233,7 @@ $roletag
$sectag
$userpicktag
</form>
+<br /><a href="$feedurl">Continue</a>
</body>
</html>
ENDREDIR
@@ -1428,68 +2241,79 @@ ENDREDIR
sub no_redirect_back {
my ($r,$feedurl) = @_;
+ my $nofeed=&mt('Sorry, no feedback possible on this resource ...');
+ my $continue=&mt('Continue');
+ my $html=&Apache::lonxml::xmlbegin();
+ my $encoding=&Apache::lonxml::fontsettings();
$r->print (<<ENDNOREDIR);
-<html>
-<head><title>Feedback not sent</title>
+$html
+<head>
+$encoding
+<title>Feedback not sent</title>
<meta http-equiv="pragma" content="no-cache" />
ENDNOREDIR
if ($feedurl!~/^\/adm\/feedback/) {
- $r->print('<meta HTTP-EQUIV="Refresh" CONTENT="2; url='.$feedurl.'">');
+ $r->print('<meta HTTP-EQUIV="Refresh" CONTENT="2; url='.
+ &Apache::lonenc::check_encrypt($feedurl).'">');
}
-
+ $feedurl=&Apache::lonenc::check_encrypt($feedurl);
+ my $logo=&Apache::loncommon::lonhttpdurl('/adm/lonIcons/lonlogos.gif');
$r->print (<<ENDNOREDIRTWO);
</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>
+<img align="right" src="$logo" />
+<b>$nofeed</b>
+<br /><a href="$feedurl">$continue</a>
</body>
</html>
ENDNOREDIRTWO
}
sub screen_header {
- my ($feedurl) = @_;
+ my ($feedurl,$symb) = @_;
my $msgoptions='';
my $discussoptions='';
unless (($ENV{'form.replydisc'}) || ($ENV{'form.editdisc'})) {
if (($feedurl=~/^\/res\//) && ($feedurl!~/^\/res\/adm/)) {
$msgoptions=
- '<p><input type="checkbox" name="author" /> '.
- &mt('Feedback to resource author').'</p>';
+ '<p><label><input type="checkbox" name="author" /> '.
+ &mt('Feedback to resource author').'</label></p>';
}
if (&feedback_available(1)) {
$msgoptions.=
- '<br /><input type="checkbox" name="question" /> '.
- &mt('Question about resource content');
+ '<p><label><input type="checkbox" name="question" /> '.
+ &mt('Question about resource content').'</label></p>';
}
if (&feedback_available(0,1)) {
$msgoptions.=
- '<br /><input type="checkbox" name="course" /> '.
- &mt('Question/Comment/Feedback about course content');
+ '<p><label><input type="checkbox" name="course" /> '.
+ &mt('Question/Comment/Feedback about course content').
+ '</label></p>';
}
if (&feedback_available(0,0,1)) {
$msgoptions.=
- '<br /><input type="checkbox" name="policy" /> '.
- &mt('Question/Comment/Feedback about course policy');
+ '<p><label><input type="checkbox" name="policy" /> '.
+ &mt('Question/Comment/Feedback about course policy').
+ '</label></p>';
}
}
if ($ENV{'request.course.id'}) {
- if (&discussion_open() &&
+ if (&discussion_open(undef,$symb) &&
&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;" '.
+ $discussoptions='<label><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;" /> '.
+ $discussoptions.='</label><br /><label><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>';
- }
+ ' <i>('.&mt('name only visible to course faculty').')</i></label>';
+ }
}
- if ($msgoptions) { $msgoptions='<h2><img src="/adm/lonMisc/feedback.gif" />'.&mt('Sending Messages').'</h2>'.$msgoptions; }
+ if ($msgoptions) { $msgoptions='<h2><img src="'.&Apache::loncommon::lonhttpdurl('/adm/lonMisc/feedback.gif').'" />'.&mt('Sending Messages').'</h2>'.$msgoptions; }
if ($discussoptions) {
- $discussoptions='<h2><img src="/adm/lonMisc/chat.gif" />'.&mt('Discussion Contributions').'</h2>'.$discussoptions; }
+ $discussoptions='<h2><img src="'.&Apache::loncommon::lonhttpdurl('/adm/lonMisc/chat.gif').'" />'.&mt('Discussion Contributions').'</h2>'.$discussoptions; }
return $msgoptions.$discussoptions;
}
@@ -1509,33 +2333,31 @@ 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;
}
sub assemble_email {
my ($feedurl,$message,$prevattempts,$usersaw,$useranswer)=@_;
my $email=<<"ENDEMAIL";
-Refers to <a href="$feedurl">$feedurl</a>
-
$message
ENDEMAIL
my $citations=<<"ENDCITE";
@@ -1652,7 +2474,13 @@ sub send_msg {
sub adddiscuss {
my ($symb,$email,$anon,$attachmenturl,$subject)=@_;
my $status='';
- if (&discussion_open() &&
+ my $realsymb;
+ if ($symb=~/^bulletin___/) {
+ my $filename=(&Apache::lonnet::decode_symb($symb))[2];
+ $filename=~s|^adm/wrapper/||;
+ $realsymb=&Apache::lonnet::symbread($filename);
+ }
+ if (&discussion_open(undef,$realsymb) &&
&Apache::lonnet::allowed('pch',$ENV{'request.course.id'}.
($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:''))) {
@@ -1681,6 +2509,8 @@ sub adddiscuss {
$contrib{'history'} = '';
my $numoldver = 0;
my ($oldsymb,$oldidx)=split(/\:\:\:/,$ENV{'form.editdisc'});
+ &Apache::lonenc::check_decrypt(\$oldsymb);
+ $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 +2527,22 @@ 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'} =~ /^<version num="0">/) {
+ $contrib{'subject'} = '<version num="'.$numnewver.'">'.&HTML::Entities::encode($contrib{'subject'},'<>&"').'</version>';
+ $contrib{'subject'} = $oldcontrib{$oldidx.':subject'}.$contrib{'subject'};
+ } else {
+ $contrib{'subject'} = '<version num="0">'.&HTML::Entities::encode($oldcontrib{$oldidx.':subject'},'<>&"').'</version><version num="1">'.&HTML::Entities::encode($contrib{'subject'},'<>&"').'</version>';
+ }
}
if (defined($oldcontrib{$oldidx.':message'})) {
- $contrib{'message'} = $oldcontrib{$oldidx.':message'}.'::::'.$numoldver.'::::'.$contrib{'message'};
+ if ($oldcontrib{$oldidx.':message'} =~ /^<version num="0">/) {
+ $contrib{'message'} = '<version num="'.$numnewver.'">'.&HTML::Entities::encode($contrib{'message'},'<>&"').'</version>';
+ $contrib{'message'} = $oldcontrib{$oldidx.':message'}.$contrib{'message'};
+ } else {
+ $contrib{'message'} = '<version num="0">'.&HTML::Entities::encode($oldcontrib{$oldidx.':message'},'<>&"').'</version><version num="1">'.&HTML::Entities::encode($contrib{'message'},'<>&"').'</version>';
+ }
}
$contrib{'history'} .= $oldcontrib{$oldidx.':timestamp'};
foreach (keys %contrib) {
@@ -1744,6 +2585,8 @@ sub adddiscuss {
sub show_preview {
my $r=shift;
+ &Apache::loncommon::content_type($r,'text/html');
+ $r->send_http_header;
my $message=&clear_out_html($ENV{'form.comment'});
$message=~s/\n/\<br \/\>/g;
$message=&Apache::lonspeller::markeduptext($message);
@@ -1757,17 +2600,346 @@ 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">
<input type="hidden" name="comment" />
<input type="button" value="$pre"
-onClick="if (typeof(document.mailform.onsubmit)!='undefined') {document.mailform.onsubmit();};this.form.comment.value=document.mailform.comment.value;this.form.subject.value=document.mailform.subject.value;this.form.submit();" />
+onClick="if (typeof(document.mailform.onsubmit)=='function') {document.mailform.onsubmit();};this.form.comment.value=document.mailform.comment.value;this.form.subject.value=document.mailform.subject.value;this.form.submit();" />
</form>
ENDPREVIEW
}
+sub modify_attachments {
+ my ($r,$currnewattach,$currdelold,$symb,$idx,$attachmenturls)=@_;
+ my $orig_subject = &Apache::lonnet::unescape($ENV{'form.subject'});
+ my $subject=&clear_out_html($orig_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);
+ }
+ &Apache::lonenc::check_encrypt(\$symb);
+ my $html=&Apache::lonxml::xmlbegin();
+ my $encoding=&Apache::lonxml::fontsettings();
+ $r->print(<<END);
+$html
+<head>
+$encoding
+<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 my $id (@currold) {
+ my $attachurl = &HTML::Entities::decode($attachments{$id}{'filename'});
+ $attachurl =~ m#/([^/]+)$#;
+ $r->print('<label><input type="checkbox" name="deloldattach" value="'.$id.'" /> '.$1.'</label><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('<label><input type="checkbox" name="delnewattach" value="'.$_.'" /> '.$1.'</label><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="if (typeof(document.mailform.onsubmit)=='function') {document.mailform.onsubmit();};this.form.comment.value=escape(document.mailform.comment.value);this.form.subject.value=escape(document.mailform.subject.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) = @_;
+ %{$attachments}=();
+ &get_post_attachments($attachments,$attachmenturls);
+ foreach my $id (sort keys %{$attachments}) {
+ if (exists($$attachments{$id}{$numoldver})) {
+ if (defined($currdelold)) {
+ if (@{$currdelold} > 0) {
+ unless (grep/^$id$/,@{$currdelold}) {
+ $$currattach{$id} = $$attachments{$id}{$numoldver};
+ }
+ } else {
+ $$currattach{$id} = $$attachments{$id}{$numoldver};
+ }
+ } else {
+ $$currattach{$id} = $$attachments{$id}{$numoldver};
+ }
+ }
+ }
+ my @attached = (sort { $a <=> $b } keys %{$currattach});
+ if (@attached == 1) {
+ my $id = $attached[0];
+ my $attachurl;
+ if ($attachmenturls =~ m/^<attachment id="0">/) {
+ $attachurl = &HTML::Entities::decode($$attachments{$id}{'filename'});
+ } else {
+ $attachurl = $$attachments{$id}{'filename'};
+ }
+ $attachurl=~m|/([^/]+)$|;
+ $$message.='<br /><a href="'.$attachurl.'"><tt>'.
+ $1.'</tt></a><br />';
+ &Apache::lonnet::allowuploaded('/adm/feedback',
+ $attachurl);
+ } elsif (@attached > 1) {
+ $$message.='<ol>';
+ foreach (@attached) {
+ my $id = $_;
+ my $attachurl = &HTML::Entities::decode($$attachments{$id}{'filename'});
+ my ($fname)
+ =($attachurl=~m|/([^/]+)$|);
+ $$message .= '<li><a href="'.$attachurl.
+ '"><tt>'.
+ $fname.'</tt></a></li>';
+ &Apache::lonnet::allowuploaded('/adm/feedback',
+ $attachurl);
+ }
+ $$message .= '</ol>';
+ }
+}
+
+sub construct_attachmenturl {
+ my ($currnewattach,$keepold,$symb,$idx)=@_;
+ my $oldattachmenturl;
+ my $newattachmenturl;
+ my $startnum = 0;
+ 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/^<attachment id="0">/) {
+ my %attachments = ();
+ my $prevver = $currver-1;
+ &get_post_attachments(\%attachments,$oldattachmenturl);
+ my $numattach = scalar(keys %attachments);
+ $startnum += $numattach;
+ foreach my $num (sort {$a <=> $b} keys %attachments) {
+ $newattachmenturl .= '<attachment id="'.$num.'"><filename>'.$attachments{$num}{'filename'}.'</filename>';
+ foreach $_ (sort {$a <=> $b} keys %{$attachments{$num}}) {
+ unless ($_ eq 'filename') {
+ $newattachmenturl .= '<post id="'.$_.'">'.$attachments{$num}{$_}.'</post>';
+ }
+ }
+ if (grep/^$num$/,@{$keepold}) {
+ $newattachmenturl .= '<post id="'.$currver.'">'.$attachments{$num}{$prevver}.'</post>';
+ }
+ $newattachmenturl .= '</attachment>';
+ }
+ } else {
+ $newattachmenturl = '<attachment id="0"><filename>'.&HTML::Entities::encode($oldattachmenturl).'</filename><post id="0">n</post>';
+ unless (grep/^0$/,@{$keepold}) {
+ $newattachmenturl .= '<post id="1">n</post>';
+ }
+ $newattachmenturl .= '</attachment>';
+ $startnum ++;
+ }
+ }
+ }
+ for (my $i=0; $i<@{$currnewattach}; $i++) {
+ my $attachnum = $startnum + $i;
+ $newattachmenturl .= '<attachment id="'.$attachnum.'"><filename>'.&HTML::Entities::encode($$currnewattach[$i]).'</filename><post id="'.$currver.'">n</post></attachment>';
+ }
+ return $newattachmenturl;
+}
+
+sub has_discussion {
+ my $resourcesref = shift;
+ my $navmap = Apache::lonnavmaps::navmap->new();
+ my @allres=$navmap->retrieveResources();
+ foreach my $resource (@allres) {
+ if ($resource->hasDiscussion()) {
+ my $ressymb;
+ if ($resource->symb() =~ m-(___adm/\w+/\w+)/(\d+)/bulletinboard$-) {
+ $ressymb = 'bulletin___'.$2.$1.'/'.$2.'/bulletinboard';
+ } else {
+ $ressymb = $resource->symb();
+ }
+ push @{$resourcesref}, $ressymb;
+ }
+ }
+ return;
+}
+
+sub sort_filter_names {
+ my ($sort_types,$role_types,$status_types) = @_;
+ %{$sort_types} = (
+ ascdate => 'Date order - oldest first',
+ descdate => 'Date order - newest first',
+ thread => 'Threaded',
+ subject => 'By subject',
+ username => 'By domain and username',
+ lastfirst => 'By last name, first name'
+ );
+ %{$role_types} = (
+ all => 'All roles',
+ st => 'Students',
+ cc => 'Course Coordinators',
+ in => 'Instructors',
+ ta => 'TAs',
+ ep => 'Exam proctors',
+ ad => 'Administrators',
+ cr => 'Custom roles'
+ );
+ %{$status_types} = (
+ all => 'Roles of any status',
+ Active => 'Only active roles',
+ Expired => 'Only inactive roles'
+ );
+}
+
sub handler {
my $r = shift;
if ($r->header_only) {
@@ -1779,363 +2951,392 @@ 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']);
- if ($ENV{'form.posterlist'}) {
- &Apache::loncommon::content_type($r,'text/html');
- $r->send_http_header;
- my $symb=$ENV{'form.posterlist'};
- my $sortposts = $ENV{'form.sortposts'};
- my ($map,$ind,$url)=&Apache::lonnet::decode_symb($symb);
- my $previous=$ENV{'form.previous'};
- 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||;
+ ['hide','unhide','deldisc','postdata','preview','replydisc','editdisc','cmd','symb','onlyunread','allposts','onlyunmark','previous','markread','markonread','markondisp','toggoff','toggon','modifydisp','changes','navtime','navmaps','navurl','sortposts','applysort','rolefilter','statusfilter','sectionpick','posterlist','userpick','attach','origpage','currnewattach','deloldattach','keepold','allversions','export']);
+
+ if ($ENV{'form.discsymb'}) {
+ my ($symb,$feedurl) = &get_feedurl_and_clean_symb($ENV{'form.discsymb'});
+ my $readkey = $symb.'_read';
+ my $chgcount = 0;
+ my %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'});
}
- &print_showposters($r,$symb,$previous,$feedurl,$sortposts);
+ &redirect_back($r,$feedurl,&mt('Marked postings read/unread').'<br />',
+ '0','0','',$ENV{'form.previous'},'','','',);
return OK;
}
- if ($ENV{'form.userpick'}) {
+ if ($ENV{'form.allversions'}) {
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
- my $symb=$ENV{'form.userpick'};
- my ($map,$ind,$url)=&Apache::lonnet::decode_symb($symb);
- my $previous=$ENV{'form.previous'};
-# backward compatibility (bulletin boards used to be 'wrapped')
- my $ressymb=$symb;
- unless ($ressymb =~ m|bulletin___\d+___adm/wrapper|) {
- $ressymb=~s|(bulletin___\d+___)|$1adm/wrapper|;
- }
- my $sort=$ENV{'form.sortposts'};
- my @posters = ();
- if (ref($ENV{'form.stuinfo'}) eq 'ARRAY') {
- @posters = $ENV{'form.stuinfo'};
- } else {
- $posters[0] = $ENV{'form.stuinfo'};
+ my $html=&Apache::lonxml::xmlbegin();
+ my $encoding=&Apache::lonxml::fontsettings();
+ my $bodytag=&Apache::loncommon::bodytag('Discussion Post Versions');
+ $r->print(<<END);
+$html
+<head>
+$encoding
+<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'});
+ ($symb)=&get_feedurl_and_clean_symb($symb);
+ if ($idx > 0) {
+ my %messages = ();
+ my %subjects = ();
+ my %attachmsgs = ();
+ my %allattachments = ();
+ my %imsfiles = ();
+ my ($screenname,$plainname);
+ my %contrib=&Apache::lonnet::restore($symb,$ENV{'request.course.id'},
+ $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+ $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+ $r->print(&get_post_contents(\%contrib,$idx,$seeid,'allversions',\%messages,\%subjects,\%allattachments,\%attachmsgs,\%imsfiles,\$screenname,\$plainname));
}
+ return OK;
+ }
+ if ($ENV{'form.posterlist'}) {
+ my ($symb,$feedurl)=&get_feedurl_and_clean_symb($ENV{'form.applysort'});
+ &print_showposters($r,$symb,$ENV{'form.previous'},$feedurl,
+ $ENV{'form.sortposts'});
+ return OK;
+ }
+ if ($ENV{'form.userpick'}) {
+ my @posters = &Apache::loncommon::get_env_multiple('form.stuinfo');
+ my ($symb,$feedurl)=&get_feedurl_and_clean_symb($ENV{'form.userpick'});
my $numpicks = @posters;
- if (defined($ENV{'form.userpick'})) {
- my %discinfo = ();
- $discinfo{$ressymb.'_userpick'} = join('&',@posters);
- &Apache::lonnet::put('nohist_'.$ENV{'request.course.id'}.'_discuss',\%discinfo,$ENV{'user.domain'},$ENV{'user.name'});
- }
- 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||;
- }
- &redirect_back($r,$feedurl,&mt('Changed sort/filter').'<br />','0','0','',$previous,$sort,'','','',$numpicks);
+ my %discinfo;
+ $discinfo{$symb.'_userpick'} = join('&',@posters);
+ &Apache::lonnet::put('nohist_'.$ENV{'request.course.id'}.'_discuss',
+ \%discinfo,$ENV{'user.domain'},$ENV{'user.name'});
+ &redirect_back($r,$feedurl,&mt('Changed sort/filter').'<br />','0','0',
+ '',$ENV{'form.previous'},$ENV{'form.sortposts'},'','','',
+ $numpicks);
return OK;
}
if ($ENV{'form.applysort'}) {
- &Apache::loncommon::content_type($r,'text/html');
- $r->send_http_header;
- my $symb=$ENV{'form.applysort'};
- my ($map,$ind,$url)=&Apache::lonnet::decode_symb($symb);
- my $previous=$ENV{'form.previous'};
- my $sort = $ENV{'form.sortposts'};
- my $rolefilter = $ENV{'form.rolefilter'};
- my $statusfilter = $ENV{'form.statusfilter'};
- my $secpick = $ENV{'form.sectionpick'};
- 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||;
- }
- &redirect_back($r,$feedurl,&mt('Changed sort/filter').'<br />','0','0','',$previous,$sort,$rolefilter,$statusfilter,$secpick);
+ my ($symb,$feedurl)=&get_feedurl_and_clean_symb($ENV{'form.applysort'});
+ &redirect_back($r,$feedurl,&mt('Changed sort/filter').'<br />','0','0',
+ '',$ENV{'form.previous'},$ENV{'form.sortposts'},
+ $ENV{'form.rolefilter'},$ENV{'form.statusfilter'},
+ $ENV{'form.sectionpick'});
return OK;
- } elsif ($ENV{'form.sortfilter'}) {
- &Apache::loncommon::content_type($r,'text/html');
- $r->send_http_header;
- my $symb=$ENV{'form.sortfilter'};
- my ($map,$ind,$url)=&Apache::lonnet::decode_symb($symb);
- my $previous=$ENV{'form.previous'};
- 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_sortfilter_options($r,$symb,$previous,$feedurl);
+ } elsif ($ENV{'form.cmd'} eq 'sortfilter') {
+ my ($symb,$feedurl)=&get_feedurl_and_clean_symb($ENV{'form.symb'});
+ &print_sortfilter_options($r,$symb,$ENV{'form.previous'},$feedurl);
return OK;
- } elsif ($ENV{'form.navmaps'}) {
+ } elsif ($ENV{'form.navtime'}) {
my %discinfo = ();
my @resources = ();
- if ($ENV{'form.navmaps'} =~ /:/) {
- @resources = split/:/,$ENV{'form.navmaps'};
+ if (defined($ENV{'form.navmaps'})) {
+ if ($ENV{'form.navmaps'} =~ /:/) {
+ @resources = split/:/,$ENV{'form.navmaps'};
+ } else {
+ @resources = ("$ENV{'form.navmaps'}");
+ }
} else {
- @resources = ("$ENV{'form.navmaps'}");
+ &has_discussion(\@resources);
}
my $numitems = @resources;
my $feedurl = '/adm/navmaps';
- if ($ENV{'form.navurl'}) {
- $feedurl .= '?'.$ENV{'form.navurl'};
- }
+ if ($ENV{'form.navurl'}) { $feedurl .= '?'.$ENV{'form.navurl'}; }
my %lt = &Apache::lonlocal::texthash(
'mnpa' => 'Marked "New" posts as read in a total of',
- 'robb' => 'resources/bulletin boards.'
+ 'robb' => 'resources/bulletin boards.',
+ 'twnp' => 'There are currently no resources or bulletin boards with unread discussion postings.'
);
foreach (@resources) {
# backward compatibility (bulletin boards used to be 'wrapped')
my $ressymb=$_;
+ &Apache::lonenc::check_decrypt(\$ressymb);
if ($ressymb =~ m/bulletin___\d+___/) {
unless ($ressymb =~ m|bulletin___\d+___adm/wrapper|) {
$ressymb=~s|(bulletin___\d+___)|$1adm/wrapper/|;
}
}
my $lastkey = $ressymb.'_lastread';
- $discinfo{$lastkey} = time;
+ $discinfo{$lastkey} = $ENV{'form.navtime'};
+ }
+ my $textline = "<b>$lt{'mnpa'} $numitems $lt{'robb'}</b>";
+ if ($numitems > 0) {
+ &Apache::lonnet::put('nohist_'.$ENV{'request.course.id'}.'_discuss',
+ \%discinfo,$ENV{'user.domain'},$ENV{'user.name'});
+ } else {
+ $textline = "<b>$lt{'twnp'}</b>";
}
- &Apache::lonnet::put('nohist_'.$ENV{'request.course.id'}.'_discuss',\%discinfo,$ENV{'user.domain'},$ENV{'user.name'});
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
+ my $logo=&Apache::loncommon::lonhttpdurl('/adm/lonIcons/lonlogos.gif');
+ my $html=&Apache::lonxml::xmlbegin();
+ my $encoding=&Apache::lonxml::fontsettings();
$r->print (<<ENDREDIR);
-<html>
+$html
<head>
+$encoding
<title>New posts marked as read</title>
<meta http-equiv="pragma" content="no-cache" />
<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" />
-<b>$lt{'mnpa'} $numitems $lt{'robb'}</b>
+<img align="right" src="$logo" />
+$textline
<form name="reldt" action="$feedurl" target="loncapaclient">
</form>
+<br /><a href="$feedurl">Continue</a>
</body>
</html>
ENDREDIR
return OK;
} elsif ($ENV{'form.modifydisp'}) {
- &Apache::loncommon::content_type($r,'text/html');
- $r->send_http_header;
- 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 $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);
+ my ($symb,$feedurl)=&get_feedurl_and_clean_symb($ENV{'form.modifydisp'});
+ my ($dispchgA,$dispchgB,$markchg,$toggchg) =
+ split(/_/,$ENV{'form.changes'});
+ &print_display_options($r,$symb,$ENV{'form.previous'},$dispchgA,
+ $dispchgB,$markchg,$toggchg,$feedurl);
return OK;
- } elsif (($ENV{'form.markondisp'}) || ($ENV{'form.markonread'}) || ($ENV{'form.allposts'}) || ($ENV{'form.onlyunread'}) ) {
- &Apache::loncommon::content_type($r,'text/html');
- $r->send_http_header;
- my $previous=$ENV{'form.previous'};
- my ($map,$ind,$url);
- 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'};
- 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 $lastkey = $ressymb.'_lastread';
- my $ondispkey = $ressymb.'_markondisp';
- if ($ENV{'form.markondisp'}) {
- $discinfo{$lastkey} = time;
- $discinfo{$ondispkey} = 1;
- } elsif ($ENV{'form.markonread'}) {
- if ( $previous > 0 ) {
- $discinfo{$lastkey} = $previous;
- }
- $discinfo{$ondispkey} = 0;
- }
- &Apache::lonnet::put('nohist_'.$ENV{'request.course.id'}.'_discuss',\%discinfo,$ENV{'user.domain'},$ENV{'user.name'});
- }
- if (($ENV{'form.allposts'}) || ($ENV{'form.onlyunread'})) {
-# ----------------------------------------------------------------- Modify display setting for this discussion
- my $symb=$ENV{'form.allposts'}?$ENV{'form.allposts'}:$ENV{'form.onlyunread'};
- 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 = ();
- if ($ENV{'form.allposts'}) {
- $discinfo{$ressymb.'_showonlyunread'} = 0;
- } elsif ($ENV{'form.onlyunread'}) {
- $discinfo{$ressymb.'_showonlyunread'} = 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'}) ) {
- &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
- &Apache::loncommon::content_type($r,'text/html');
- $r->send_http_header;
- 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|;
+ } elsif ($ENV{'form.markondisp'} || $ENV{'form.markonread'} ||
+ $ENV{'form.allposts'} || $ENV{'form.onlyunread'} ||
+ $ENV{'form.onlyunmark'} || $ENV{'form.toggoff'} ||
+ $ENV{'form.toggon'} || $ENV{'form.markread'}) {
+ my ($symb,$feedurl)=&get_feedurl_and_clean_symb($ENV{'form.symb'});
+ my %discinfo;
+# ------------------------ Modify setting for read/unread toggle for each post
+ if ($ENV{'form.toggoff'}) { $discinfo{$symb.'_readtoggle'}=0; }
+ if ($ENV{'form.toggon'}) { $discinfo{$symb.'_readtoggle'}=1; }
+# --------- Modify setting for identification of 'NEW' posts in this discussion
+ if ($ENV{'form.markondisp'}) {
+ $discinfo{$symb.'_lastread'} = time;
+ $discinfo{$symb.'_markondisp'} = 1;
+ }
+ if ($ENV{'form.markonread'}) {
+ if ( $ENV{'form.previous'} > 0 ) {
+ $discinfo{$symb.'_lastread'} = $ENV{'form.previous'};
+ }
+ $discinfo{$symb.'_markondisp'} = 0;
}
- 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');
+# --------------------------------- Modify display setting for this discussion
+ if ($ENV{'form.allposts'}) {
+ $discinfo{$symb.'_showonlyunread'} = 0;
+ $discinfo{$symb.'_showonlyunmark'} = 0;
+ }
+ if ($ENV{'form.onlyunread'}) { $discinfo{$symb.'_showonlyunread'} = 1; }
+ if ($ENV{'form.onlyunmark'}) { $discinfo{$symb.'_showonlyunmark'} = 1; }
+# ----------------------------------------------------- Mark new posts not NEW
+ if ($ENV{'form.markread'}) { $discinfo{$symb.'_lastread'} = time; }
+ &Apache::lonnet::put('nohist_'.$ENV{'request.course.id'}.'_discuss',
+ \%discinfo,$ENV{'user.domain'},$ENV{'user.name'});
+ my $previous=$ENV{'form.previous'};
+ if ($ENV{'form.markondisp'}) { $previous=undef; }
+ &redirect_back($r,$feedurl,&mt('Changed display status').'<br />',
+ '0','0','',$previous);
return OK;
} elsif (($ENV{'form.hide'}) || ($ENV{'form.unhide'})) {
# ----------------------------------------------------------------- Hide/unhide
- &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)=&Apache::lonnet::decode_symb($symb);
+ my $entry=$ENV{'form.hide'}?$ENV{'form.hide'}:$ENV{'form.unhide'};
+ my ($symb,$idx)=split(/\:\:\:/,$entry);
+ ($symb,my $feedurl)=&get_feedurl_and_clean_symb($symb);
- my %contrib=&Apache::lonnet::restore($symb,$ENV{'request.course.id'},
- $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
- $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+ my %contrib=&Apache::lonnet::restore($symb,$ENV{'request.course.id'},
+ $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+ $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
-
- my $currenthidden=$contrib{'hidden'};
- my $currentstudenthidden=$contrib{'studenthidden'};
+ my $currenthidden=$contrib{'hidden'};
+ my $currentstudenthidden=$contrib{'studenthidden'};
- 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);
-
- if ($ENV{'form.hide'}) {
- $currenthidden.='.'.$idx.'.';
- unless ($seeid) {
- $currentstudenthidden.='.'.$idx.'.';
- }
- } else {
- $currenthidden=~s/\.$idx\.//g;
- }
- my %newhash=('hidden' => $currenthidden);
- if ( ($ENV{'form.hide'}) && (!$seeid) ) {
- $newhash{'studenthidden'} = $currentstudenthidden;
- }
+ 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);
+
+ if ($ENV{'form.hide'}) {
+ $currenthidden.='.'.$idx.'.';
+ unless ($seeid) {
+ $currentstudenthidden.='.'.$idx.'.';
+ }
+ } else {
+ $currenthidden=~s/\.$idx\.//g;
+ }
+ my %newhash=('hidden' => $currenthidden);
+ if ( ($ENV{'form.hide'}) && (!$seeid) ) {
+ $newhash{'studenthidden'} = $currentstudenthidden;
+ }
- &Apache::lonnet::store(\%newhash,$symb,$ENV{'request.course.id'},
- $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
- $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+ &Apache::lonnet::store(\%newhash,$symb,$ENV{'request.course.id'},
+ $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+ $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
- &redirect_back($r,&Apache::lonnet::clutter($url),
- &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;
- if ($ENV{'form.threadedon'}) {
+ &redirect_back($r,$feedurl,&mt('Changed discussion status').'<br />',
+ '0','0','',$ENV{'form.previous'});
+ return OK;
+ } elsif ($ENV{'form.cmd'}=~/^(threadedoff|threadedon)$/) {
+ my ($symb,$feedurl)=&get_feedurl_and_clean_symb($ENV{'form.symb'});
+ if ($ENV{'form.cmd'} eq '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','',$ENV{'form.previous'});
+ &redirect_back($r,$feedurl,&mt('Changed discussion view mode').'<br />',
+ '0','0','',$ENV{'form.previous'});
+ return OK;
} elsif ($ENV{'form.deldisc'}) {
# --------------------------------------------------------------- Hide for good
- &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)=&Apache::lonnet::decode_symb($symb);
-
- my %contrib=&Apache::lonnet::restore($symb,$ENV{'request.course.id'},
- $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
- $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
-
-
- my $currentdeleted=$contrib{'deleted'};
-
- $currentdeleted.='.'.$idx.'.';
-
- my %newhash=('deleted' => $currentdeleted);
-
- &Apache::lonnet::store(\%newhash,$symb,$ENV{'request.course.id'},
- $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
- $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
-
- &redirect_back($r,&Apache::lonnet::clutter($url),
- &mt('Changed discussion status').'<br />','0','0','',$ENV{'form.previous'});
+ my ($symb,$idx)=split(/\:\:\:/,$ENV{'form.deldisc'});
+ ($symb,my $feedurl)=&get_feedurl_and_clean_symb($symb);
+ my %contrib=&Apache::lonnet::restore($symb,$ENV{'request.course.id'},
+ $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+ $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+ my %newhash=('deleted' => $contrib{'deleted'}.".$idx.");
+ &Apache::lonnet::store(\%newhash,$symb,$ENV{'request.course.id'},
+ $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+ $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+ &redirect_back($r,$feedurl,&mt('Changed discussion status').'<br />',
+ '0','0','',$ENV{'form.previous'});
+ return OK;
} elsif ($ENV{'form.preview'}) {
# -------------------------------------------------------- User wants a preview
- $r->content_type('text/html');
- $r->send_http_header;
&show_preview($r);
+ return OK;
+ } 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,@currdelold,@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 ($symb) = &get_feedurl_and_clean_symb($ENV{'form.attach'});
+ my $idx = $ENV{'form.idx'};
+ 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);
+ return OK;
+ } elsif ($ENV{'form.export'}) {
+ &Apache::loncommon::content_type($r,'text/html');
+ $r->send_http_header;
+ my ($symb,$feedurl) = &get_feedurl_and_clean_symb($ENV{'form.export'});
+ my $mode='board';
+ my $status='OPEN';
+ my $previous=$ENV{'form.previous'};
+ if ($feedurl =~ /\.(problem|exam|quiz|assess|survey|form|library)$/) {
+ $mode='problem';
+ $status=$Apache::inputtags::status[-1];
+ }
+ my $discussion = &list_discussion($mode,$status,$symb);
+ my $bodytag=&Apache::loncommon::bodytag('Resource Feedback and Discussion');
+ $r->print($bodytag.$discussion);
+ return OK;
} else {
# ------------------------------------------------------------- Normal feedback
- my $feedurl=$ENV{'form.postdata'};
- $feedurl=~s/^http\:\/\///;
- $feedurl=~s/^$ENV{'SERVER_NAME'}//;
- $feedurl=~s/^$ENV{'HTTP_HOST'}//;
- $feedurl=~s/\?.+$//;
+ my $feedurl=$ENV{'form.postdata'};
+ $feedurl=~s/^http\:\/\///;
+ $feedurl=~s/^$ENV{'SERVER_NAME'}//;
+ $feedurl=~s/^$ENV{'HTTP_HOST'}//;
+ $feedurl=~s/\?.+$//;
- 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);
- } elsif ($ENV{'form.editdisc'}) {
- $symb=(split(/\:\:\:/,$ENV{'form.editdisc'}))[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 $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);
+ $feedurl=&Apache::lonnet::clutter($url);
+ } elsif ($ENV{'form.editdisc'}) {
+ $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);
+ }
+ unless ($symb) {
+ $symb=$ENV{'form.symb'};
+ if ($symb) {
+ my ($map,$id,$url)=&Apache::lonnet::decode_symb($symb);
+ $feedurl=&Apache::lonnet::clutter($url);
+ }
+ }
+ &Apache::lonenc::check_decrypt(\$symb);
+ my $goahead=1;
+ if ($feedurl=~/\.(problem|exam|quiz|assess|survey|form)$/) {
+ unless ($symb) { $goahead=0; }
+ }
+ # backward compatibility (bulletin boards used to be 'wrapped')
+ if ($feedurl=~m|^/adm/wrapper/adm/.*/bulletinboard$|) {
+ $feedurl=~s|^/adm/wrapper||;
+ }
+ if (!$goahead) {
+ # Ambiguous Problem Resource
+ $r->internal_redirect('/adm/ambiguous');
+ return OK;
}
- }
- my $goahead=1;
- if ($feedurl=~/\.(problem|exam|quiz|assess|survey|form)$/) {
- unless ($symb) { $goahead=0; }
- }
- # backward compatibility (bulletin 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
- &Apache::loncommon::content_type($r,'text/html');
- $r->send_http_header;
-
- if (
- (
- ($feedurl=~m:^/res:) && ($feedurl!~m:^/res/adm:)
- )
- ||
- ($ENV{'request.course.id'} && ($feedurl!~m:^/adm:))
- ||
- ($ENV{'request.course.id'} && ($symb=~/^bulletin\_\_\_/))
- ) {
+ unless (
+ (
+ ($feedurl=~m:^/res:) && ($feedurl!~m:^/res/adm:)
+ )
+ ||
+ ($ENV{'request.course.id'} && ($feedurl!~m:^/adm:))
+ ||
+ ($ENV{'request.course.id'} && ($symb=~/^bulletin\_\_\_/))
+ ) {
+ &Apache::loncommon::content_type($r,'text/html');
+ $r->send_http_header;
+# Unable to give feedback
+ &no_redirect_back($r,$feedurl);
+ }
# --------------------------------------------------- Print login screen header
- unless ($ENV{'form.sendit'}) {
- my $options=&screen_header($feedurl);
- if ($options) {
- &mail_screen($r,$feedurl,$options);
- } else {
- &fail_redirect($r,$feedurl);
+ unless ($ENV{'form.sendit'}) {
+ &Apache::loncommon::content_type($r,'text/html');
+ $r->send_http_header;
+ my $options=&screen_header($feedurl,$symb);
+ if ($options) {
+ &mail_screen($r,$feedurl,$options);
+ } else {
+ &fail_redirect($r,$feedurl);
+ }
+ return OK;
}
- } else {
# Get previous user input
my $prevattempts=&Apache::loncommon::get_previous_attempt(
- $symb,$ENV{'user.name'},$ENV{'user.domain'},
- $ENV{'request.course.id'});
+ $symb,$ENV{'user.name'},$ENV{'user.domain'},
+ $ENV{'request.course.id'});
# Get output from resource
my $usersaw=&resource_output($feedurl);
@@ -2143,12 +3344,29 @@ ENDREDIR
# 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'});
+ $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'}) {
+ 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'};
+ }
+ &Apache::lonenc::check_decrypt(\$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');
}
@@ -2158,49 +3376,65 @@ ENDREDIR
# Assemble email
my ($email,$citations)=&assemble_email($feedurl,$message,$prevattempts,
- $usersaw,$useranswer);
+ $usersaw,$useranswer);
# Who gets this?
my ($typestyle,%to) = &decide_receiver($feedurl);
# Actually send mail
my ($status,$numsent)=&send_msg($feedurl,$email,$citations,
- $attachmenturl,%to);
+ $attachmenturl,%to);
# Discussion? Store that.
my $numpost=0;
- if ($ENV{'form.discuss'}) {
- my $subject = &clear_out_html($ENV{'form.subject'});
- $typestyle.=&adddiscuss($symb,$message,0,$attachmenturl,$subject);
+ if ($ENV{'form.discuss'} || $ENV{'form.anondiscuss'}) {
+ my $subject = &clear_out_html($ENV{'form.subject'});
+ my $anonmode=(defined($ENV{'form.anondiscuss'}));
+ $typestyle.=&adddiscuss($symb,$message,$anonmode,$attachmenturl,
+ $subject);
$numpost++;
}
-
- if ($ENV{'form.anondiscuss'}) {
- my $subject = &clear_out_html($ENV{'form.subject'});
- $typestyle.=&adddiscuss($symb,$message,1,$attachmenturl,$subject);
- $numpost++;
- }
-
-
+
# Receipt screen and redirect back to where came from
&redirect_back($r,$feedurl,$typestyle,$numsent,$numpost,$status,$ENV{'form.previous'});
-
- }
- } else {
-# Unable to give feedback
- &no_redirect_back($r,$feedurl);
- }
- } else {
-# Ambiguous Problem Resource
- if ( &Apache::lonnet::mod_perl_version() == 2 ) {
- &Apache::lonnet::cleanenv();
- }
- $r->internal_redirect('/adm/ambiguous');
}
-}
return OK;
}
+sub wrap_symb {
+ my ($ressymb)=@_;
+ if ($ressymb =~ /bulletin___\d+___/) {
+ unless ($ressymb =~ m|bulletin___\d+___adm/wrapper|) {
+ $ressymb=~s|(bulletin___\d+___)|$1adm/wrapper|;
+ }
+ }
+ return $ressymb;
+}
+sub dewrapper {
+ my ($feedurl)=@_;
+ if ($$feedurl=~m|^/adm/wrapper/adm/.*/bulletinboard$|) {
+ $$feedurl=~s|^/adm/wrapper||;
+ }
+}
+
+sub get_feedurl {
+ my ($symb)=@_;
+ my ($map,$ind,$url)=&Apache::lonnet::decode_symb($symb);
+ my $feedurl = &Apache::lonnet::clutter($url);
+ &dewrapper(\$feedurl);
+ return $feedurl;
+}
+
+sub get_feedurl_and_clean_symb {
+ my ($symb)=@_;
+ &Apache::lonenc::check_decrypt(\$symb);
+# backward compatibility (bulletin boards used to be 'wrapped')
+ unless ($symb =~ m|bulletin___\d+___adm/wrapper|) {
+ $symb=~s|(bulletin___\d+___)|$1adm/wrapper|;
+ }
+ my $feedurl = &get_feedurl($symb);
+ return ($symb,$feedurl);
+}
1;
__END__