Check "Show all posts?" or "Mark unread?", then "Save read settings" to display message
';
+ } else {
+ $discussionitems[$idx] .= '
'.$message.'
';
+ }
+ }
+ }
}
}
my $discussion='';
if ($visible) {
# Print a the discusssion
+ $discussion .= '';
}
if ($discussiononly) {
$discussion.=(<
-
+
Note: in anonymous discussion, your name is visible only to
course faculty
+Title:
';
+ }
+ }
return $discussion;
}
@@ -238,6 +296,7 @@ sub mail_screen {
my $title=&Apache::lonnet::gettitle($feedurl);
if (!$title) { $title = $feedurl; }
my $quote='';
+ my $subject = '';
if ($ENV{'form.replydisc'}) {
my ($symb,$idx)=split(/\:\:\:/,$ENV{'form.replydisc'});
my %contrib=&Apache::lonnet::restore($symb,$ENV{'request.course.id'},
@@ -247,9 +306,11 @@ sub mail_screen {
my $message=$contrib{$idx.':message'};
$message=~s/\n/\ /g;
$quote='
ENDDOCUMENT
@@ -329,11 +392,11 @@ sub fail_redirect {
my ($r,$feedurl) = @_;
if ($feedurl=~/^\/adm\//) { $feedurl.='?register=1' };
$r->print (<Feedback not sent
-
Sorry, no recipients ...
@@ -346,12 +409,12 @@ sub redirect_back {
my ($r,$feedurl,$typestyle,$sendsomething,$sendposts,$status) = @_;
if ($feedurl=~/^\/adm\//) { $feedurl.='?register=1' };
$r->print (<Feedback sent
-
$typestyle
@@ -367,6 +430,7 @@ ENDREDIR
sub no_redirect_back {
my ($r,$feedurl) = @_;
$r->print (<Feedback not sent
ENDNOREDIR
@@ -377,7 +441,6 @@ ENDNOREDIR
$r->print (<
-
Sorry, no feedback possible on this resource ...
@@ -416,16 +479,17 @@ sub screen_header {
if (&Apache::lonnet::allowed('pch',
$ENV{'request.course.id'}.
($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:''))) {
- $discussoptions=' '.
+ $discussoptions=' '.
&mt('Contribution to course discussion of resource');
$discussoptions.=' '.
&mt('Anonymous contribution to course discussion of resource').
' ('.&mt('name only visible to course faculty').')';
}
}
- if ($msgoptions) { $msgoptions='
'.&mt('Sending Messages').'
'.$msgoptions; }
+ if ($msgoptions) { $msgoptions='
'.&mt('Sending Messages').'
'.$msgoptions; }
if ($discussoptions) {
- $discussoptions='
'.&mt('Discussion Contributions').'
'.$discussoptions; }
+ $discussoptions='
'.&mt('Discussion Contributions').'
'.$discussoptions; }
return $msgoptions.$discussoptions;
}
@@ -583,7 +647,7 @@ sub send_msg {
}
sub adddiscuss {
- my ($symb,$email,$anon,$attachmenturl)=@_;
+ my ($symb,$email,$anon,$attachmenturl,$subject)=@_;
my $status='';
if (&Apache::lonnet::allowed('pch',$ENV{'request.course.id'}.
($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:''))) {
@@ -596,7 +660,8 @@ sub adddiscuss {
$ENV{'environment.middlename'}.' '.
$ENV{'environment.lastname'}.' '.
$ENV{'enrironment.generation'},
- 'attachmenturl'=> $attachmenturl);
+ 'attachmenturl'=> $attachmenturl,
+ 'subject' => $subject);
if ($ENV{'form.replydisc'}) {
$contrib{'replyto'}=(split(/\:\:\:/,$ENV{'form.replydisc'}))[1];
}
@@ -636,7 +701,11 @@ sub show_preview {
my $message=&clear_out_html($ENV{'form.comment'});
$message=~s/\n/\ /g;
$message=&Apache::lontexconvert::msgtexconverted($message);
+ my $subject=&clear_out_html($ENV{'form.subject'});
+ $subject=~s/\n/\ /g;
+ $subject=&Apache::lontexconvert::msgtexconverted($subject);
$r->print('
'.
+ 'Subject: '.$subject.'
'.
$message.'
');
}
@@ -644,16 +713,18 @@ sub generate_preview_button {
my $pre=&mt("Show Preview");
return(<
+
+onClick="this.form.comment.value=document.mailform.comment.value;this.form.subject.value=document.mailform.subject.value;this.form.submit();" />
ENDPREVIEW
}
+
sub handler {
my $r = shift;
if ($r->header_only) {
- $r->content_type('text/html');
+ &Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
return OK;
}
@@ -661,11 +732,78 @@ sub handler {
# --------------------------- Get query string for limited number of parameters
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
- ['hide','unhide','deldisc','postdata','preview','replydisc','threadedon','threadedoff']);
+# ['hide','unhide','deldisc','postdata','preview','replydisc','threadedon','threadedoff']);
+ ['hide','unhide','deldisc','postdata','preview','replydisc','threadedon','threadedoff','markread','markunread','storereads','onlyunread','allposts','chgreads']);
- if (($ENV{'form.hide'}) || ($ENV{'form.unhide'})) {
+ if (($ENV{'form.markread'}) || ($ENV{'form.markunread'})) {
+# ----------------------------------------------------------------- Modify read/unread for all
+ &Apache::loncommon::content_type($r,'text/html');
+ $r->send_http_header;
+ my $symb=$ENV{'form.markread'}?$ENV{'form.markread'}:$ENV{'form.markunread'};
+ my $ressymb = $symb;
+ my ($map,$ind,$url)=&Apache::lonnet::decode_symb($symb);
+ $ressymb=~s|(bulletin___\d+___)|$1adm/wrapper|;
+ my %contrib=&Apache::lonnet::restore($ressymb,$ENV{'request.course.id'},
+ $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+ $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+ my %readinghash = ();
+
+ if ($contrib{'version'}) {
+ for (my $id=1;$id<=$contrib{'version'};$id++) {
+ my $msgid = $id.':message';
+ if (defined($contrib{$msgid})) {
+ if ($ENV{'form.markread'}) {
+ $readinghash{$id} = 'read';
+ } else {
+ $readinghash{$id} = 'unread';
+ }
+ }
+ }
+ if ($ENV{'form.allposts'}) {
+ $readinghash{'showonlyunread'} = 0;
+ } elsif ($ENV{'form.onlyunread'}) {
+ $readinghash{'showonlyunread'} = 1;
+ }
+ &Apache::lonnet::cstore(\%readinghash,$symb,$ENV{'request.course.id'}.'_discuss',$ENV{'user.domain'},$ENV{'user.name'});
+ }
+
+ &redirect_back($r,&Apache::lonnet::clutter($url),&mt('Changed reading status'),'0','0');
+ return OK;
+ } else {
+ my $symb = $ENV{'form.discsymb'};
+ my %readinghash = ();
+ my $chgcount = 0;
+ foreach my $key (keys %ENV) {
+ if ($key =~ m/^form\.postunread_(\d+)/) {
+ $readinghash{$1} = 'unread';
+ $chgcount ++;
+ } elsif ($key =~ m/^form\.postread_(\d+)/) {
+ $readinghash{$1} = 'read';
+ $chgcount ++;
+ }
+ }
+ if ($ENV{'form.allposts'}) {
+ $readinghash{'showonlyunread'} = 0;
+ $chgcount ++;
+ } elsif ($ENV{'form.onlyunread'}) {
+ $readinghash{'showonlyunread'} = 1;
+ $chgcount ++;
+ }
+
+ if ($chgcount > 0) {
+ &Apache::lonnet::cstore(\%readinghash,$symb,$ENV{'request.course.id'}.'_discuss',$ENV{'user.domain'},$ENV{'user.name'});
+ }
+ }
+
+ if ($ENV{'form.chgreads'}) {
+ &Apache::loncommon::content_type($r,'text/html');
+ $r->send_http_header;
+ my ($map,$ind,$url)=&Apache::lonnet::decode_symb($ENV{'form.chgreads'});
+ &redirect_back($r,&Apache::lonnet::clutter($url),
+ &mt('Changed read status').' ','0','0');
+ } elsif (($ENV{'form.hide'}) || ($ENV{'form.unhide'})) {
# ----------------------------------------------------------------- Hide/unhide
- $r->content_type('text/html');
+ &Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
my $entry=$ENV{'form.hide'}?$ENV{'form.hide'}:$ENV{'form.unhide'};
@@ -692,22 +830,24 @@ sub handler {
$ENV{'course.'.$ENV{'request.course.id'}.'.num'});
&redirect_back($r,&Apache::lonnet::clutter($url),
- &mt('Changed discussion status').' ','0','0');
+ &mt('Changed read status').' ','0','0');
} elsif (($ENV{'form.threadedon'}) || ($ENV{'form.threadedoff'})) {
+ &Apache::loncommon::content_type($r,'text/html');
+ $r->send_http_header;
if ($ENV{'form.threadedon'}) {
&Apache::lonnet::put('environment',{'threadeddiscussion' => 'on'});
&Apache::lonnet::appenv('environment.threadeddiscussion' => 'on');
} else {
&Apache::lonnet::del('environment',['threadeddiscussion']);
&Apache::lonnet::delenv('environment\.threadeddiscussion');
- }
+ }
my $symb=$ENV{'form.threadedon'}?$ENV{'form.threadedon'}:$ENV{'form.threadedoff'};
my ($map,$ind,$url)=&Apache::lonnet::decode_symb($symb);
&redirect_back($r,&Apache::lonnet::clutter($url),
&mt('Changed discussion view mode').' ','0','0');
} elsif ($ENV{'form.deldisc'}) {
# --------------------------------------------------------------- Hide for good
- $r->content_type('text/html');
+ &Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
my $entry=$ENV{'form.deldisc'};
@@ -734,6 +874,8 @@ sub handler {
&mt('Changed discussion status').' ','0','0');
} elsif ($ENV{'form.preview'}) {
# -------------------------------------------------------- User wants a preview
+ $r->content_type('text/html');
+ $r->send_http_header;
&show_preview($r);
} else {
# ------------------------------------------------------------- Normal feedback
@@ -762,10 +904,13 @@ sub handler {
if ($feedurl=~/\.(problem|exam|quiz|assess|survey|form)$/) {
unless ($symb) { $goahead=0; }
}
-
+ # backward compatibility (bulltin boards used to be 'wrapped')
+ if ($feedurl=~m|^/adm/wrapper/adm/.*/bulletinboard$|) {
+ $feedurl=~s|^/adm/wrapper||;
+ }
if ($goahead) {
# Go ahead with feedback, no ambiguous reference
- $r->content_type('text/html');
+ &Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
if (
@@ -826,12 +971,14 @@ sub handler {
my $numpost=0;
if ($ENV{'form.discuss'}) {
- $typestyle.=&adddiscuss($symb,$message,0,$attachmenturl);
+ my $subject = &clear_out_html($ENV{'form.subject'});
+ $typestyle.=&adddiscuss($symb,$message,0,$attachmenturl,$subject);
$numpost++;
}
if ($ENV{'form.anondiscuss'}) {
- $typestyle.=&adddiscuss($symb,$message,1,$attachmenturl);
+ my $subject = &clear_out_html($ENV{'form.subject'});
+ $typestyle.=&adddiscuss($symb,$message,1,$attachmenturl,$subject);
$numpost++;
}
'.
+ &mt('Post Discussion').'
Sorry, no recipients ...
@@ -346,12 +409,12 @@ sub redirect_back {
my ($r,$feedurl,$typestyle,$sendsomething,$sendposts,$status) = @_;
if ($feedurl=~/^\/adm\//) { $feedurl.='?register=1' };
$r->print (<
'.&mt('Sending Messages').'