--- loncom/interface/lonfeedback.pm 2005/10/04 18:27:32 1.169
+++ loncom/interface/lonfeedback.pm 2006/06/29 22:20:22 1.206
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Feedback
#
-# $Id: lonfeedback.pm,v 1.169 2005/10/04 18:27:32 albertel Exp $
+# $Id: lonfeedback.pm,v 1.206 2006/06/29 22:20:22 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -39,12 +39,16 @@ use Apache::lonnet;
use Apache::lonhtmlcommon();
use Apache::lonnavmaps;
use Apache::lonenc();
+use Apache::lonrss();
use HTML::LCParser();
use Apache::lonspeller();
use Cwd;
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
sub discussion_open {
my ($status,$symb)=@_;
+ if ($env{'request.role.adv'}) { return 1; }
if (defined($status) &&
!($status eq 'CAN_ANSWER' || $status eq 'CANNOT_ANSWER'
|| $status eq 'OPEN')) {
@@ -236,7 +240,8 @@ sub list_discussion {
my %notshown = ();
my %newitem = ();
my $maxdepth=0;
-
+ my %anonhash=();
+ my $anoncnt=0;
my $target='';
unless ($env{'browser.interface'} eq 'textual' ||
$env{'environment.remote'} eq 'off' ) {
@@ -247,7 +252,7 @@ sub list_discussion {
$discinfo{$visitkey} = $visit;
&Apache::lonnet::put('nohist_'.$cid.'_discuss',\%discinfo,$env{'user.domain'},$env{'user.name'});
- &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);
+ &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,\%anonhash,$anoncnt);
my $discussion='';
my $manifestfile;
@@ -391,19 +396,20 @@ imscp_v1p1.xsd http://www.imsglobal.org/
$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>';
+ my $escsymb=&escape($ressymb);
if ($visible>2) {
$discussion.='<td align="left">'.
- '<a href="/adm/feedback?cmd=threadedon&symb='.$ressymb;
+ '<a href="/adm/feedback?cmd=threadedon&symb='.$escsymb;
if ($newpostsflag) {
$discussion .= '&previous='.$prevread;
}
$discussion .='">'.&mt('Threaded View').'</a> '.
- '<a href="/adm/feedback?cmd=threadedoff&symb='.$ressymb;
+ '<a href="/adm/feedback?cmd=threadedoff&symb='.$escsymb;
if ($newpostsflag) {
$discussion .= '&previous='.$prevread;
}
$discussion .='">'.&mt('Chronological View').'</a>
- <a href= "/adm/feedback?cmd=sortfilter&symb='.$ressymb;
+ <a href= "/adm/feedback?cmd=sortfilter&symb='.$escsymb;
if ($newpostsflag) {
$discussion .= '&previous='.$prevread;
}
@@ -411,14 +417,16 @@ imscp_v1p1.xsd http://www.imsglobal.org/
} else {
$discussion .= '<td align="left">';
}
- $discussion .='<a href= "/adm/feedback?export='.$ressymb;
+ $discussion .='<a href= "/adm/feedback?export='.$escsymb;
if ($newpostsflag) {
$discussion .= '&previous='.$prevread;
}
$discussion .= '">'.&mt('Export').'?</a> </td>';
if ($newpostsflag) {
if (!$markondisp) {
- $discussion .='<td align="right"><a href="/adm/feedback?markread=1&symb='.$ressymb.'">'.&mt('Mark NEW posts no longer new').'</a> ';
+ $discussion .='<td align="right"><a href="/adm/preferences?action=changediscussions">'.
+ &mt('Preferences on what is marked as NEW').
+ '</a><br /><a href="/adm/feedback?markread=1&symb='.$escsymb.'">'.&mt('Mark NEW posts no longer new').'</a>';
} else {
$discussion .= '<td> </td>';
}
@@ -431,7 +439,7 @@ imscp_v1p1.xsd http://www.imsglobal.org/
if ($numhidden > 0) {
my $colspan = $maxdepth+1;
$discussion.="\n".'<tr><td bgcolor="#CCCCCC" colspan="'.$colspan.'">'.
- '<a href="/adm/feedback?allposts=1&symb='.$ressymb;
+ '<a href="/adm/feedback?allposts=1&symb='.$escsymb;
if ($newpostsflag) {
$discussion .= '&previous='.$prevread;
}
@@ -688,8 +696,8 @@ END
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'});
+ $subject = &unescape($env{'form.subject'});
+ $comment = &unescape($env{'form.comment'});
my @keepold = ();
&process_attachments(\@currnewattach,\@currdelold,\@keepold);
if (@currnewattach > 0) {
@@ -720,7 +728,7 @@ ENDDISCUSS
if ($outputtarget ne 'tex') {
$discussion.=&generate_attachments_button('',$attachnum,$ressymb,$now,\@currnewattach,\@currdelold,'',$mode);
if (@currnewattach > 0) {
- $newattachmsg .= '<b>New attachments</b><br />';
+ $newattachmsg .= '<br /><b>New attachments</b><br />';
if (@currnewattach > 1) {
$newattachmsg .= '<ol>';
foreach my $item (@currnewattach) {
@@ -738,26 +746,32 @@ ENDDISCUSS
}
}
} else {
+ $discussion.='<table bgcolor="#BBBBBB"><tr><td>';
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='.
- $ressymb.':::" '.$target.'>'.
+ $discussion.='<a href="/adm/feedback?replydisc='.
+ &escape($ressymb).':::" '.$target.'>'.
'<img src="'.&Apache::loncommon::lonhttpdurl('/adm/lonMisc/chat.gif').'" border="0" />'.
- &mt('Post Discussion').'</a></td></tr></table>';
- }
+ &mt('Post Discussion').'</a><br />';
+ }
}
+ $discussion.='<a href="/adm/feedback?sendmessageonly=1&symb='.
+ &escape($ressymb).
+ '"><img src="'.&Apache::loncommon::lonhttpdurl('/adm/lonMisc/feedback.gif').'" border="0" />'.
+ &mt('Send Message').'</a></td></tr></table>';
}
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 ($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,$anonhash,$anoncnt) = @_;
my @original=();
my @index=();
my $symb=&Apache::lonenc::check_decrypt($ressymb);
+ my $escsymb=&escape($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'});
@@ -821,6 +835,13 @@ sub build_posting_display {
my %allattachments = ();
my ($screenname,$plainname);
my $sender = &mt('Anonymous');
+# Anonymous users getting number within a discussion
+# Since idx is in static order, this should give the same sequence every time.
+ my $key=$contrib{$idx.':sendername'}.'@'.$contrib{$idx.':senderdomain'};
+ unless ($$anonhash{$key}) {
+ $anoncnt++;
+ $$anonhash{$key}=&mt('Anonymous').' '.$anoncnt;
+ }
my ($message,$subject,$vgrlink,$ctlink);
&get_post_contents(\%contrib,$idx,$seeid,$outputtarget,\%messages,\%subjects,\%allattachments,\%attachtxt,$imsfiles,\$screenname,\$plainname,$numoldver);
@@ -859,7 +880,7 @@ sub build_posting_display {
$contrib{$idx.':sendername'}.' at '.
$contrib{$idx.':senderdomain'}.')';
if ($contrib{$idx.':anonymous'}) {
- $sender.=' <font color="red"><b>['.&mt('anonymous').']</b></font> '.
+ $sender.=' <font color="red"><b>['.$$anonhash{$key}.']</b></font> '.
$screenname;
}
@@ -892,16 +913,16 @@ sub build_posting_display {
} else {
@{$$namesort{$lastname}{$firstname}} = ("$idx");
}
- if ($env{'course.'.$env{'request.course.id'}.'.allow_discussion_post_editing'} =~ m/yes/i) {
+ if (&editing_allowed()) {
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) {
+ $escsymb.':::'.$idx;
+ if ($$newpostsflag) {
$sender .= '&previous='.$prevread;
}
$sender .= '" '.$target.'>'.&mt('Edit').'</a>';
unless ($seeid) {
- $sender.=" <a href=\"javascript:studentdelete('$ressymb','$idx','$newpostsflag','$prevread')";
+ $sender.=" <a href=\"javascript:studentdelete('$escsymb','$idx','$$newpostsflag','$prevread')";
$sender .= '">'.&mt('Delete').'</a>';
}
}
@@ -910,23 +931,23 @@ sub build_posting_display {
if ($hidden) {
unless ($studenthidden) {
$sender.=' <a href="/adm/feedback?unhide='.
- $ressymb.':::'.$idx;
- if ($newpostsflag) {
- $sender .= '&previous='.$prevread;
+ $escsymb.':::'.$idx;
+ if ($$newpostsflag) {
+ $sender .= '&previous='.$prevread;
}
$sender .= '">'.&mt('Make Visible').'</a>';
}
} else {
$sender.=' <a href="/adm/feedback?hide='.
- $ressymb.':::'.$idx;
- if ($newpostsflag) {
+ $escsymb.':::'.$idx;
+ if ($$newpostsflag) {
$sender .= '&previous='.$prevread;
}
$sender .= '">'.&mt('Hide').'</a>';
}
$sender.=' <a href="/adm/feedback?deldisc='.
- $ressymb.':::'.$idx;
- if ($newpostsflag) {
+ $escsymb.':::'.$idx;
+ if ($$newpostsflag) {
$sender .= '&previous='.$prevread;
}
$sender .= '">'.&mt('Delete').'</a>';
@@ -934,6 +955,8 @@ sub build_posting_display {
} else {
if ($screenname) {
$sender='<i>'.$screenname.'</i>';
+ } else {
+ $sender='<i>'.$$anonhash{$key}.'</i>';
}
# Set up for sorting by domain, then username for anonymous
unless (defined($$usernamesort{'__anon'})) {
@@ -959,9 +982,9 @@ sub build_posting_display {
$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;
+ $escsymb.':::'.$idx;
+ if ($$newpostsflag) {
+ $sender .= '&previous='.$prevread;
}
$sender .= '" '.$target.'>'.&mt('Reply').'</a>';
}
@@ -1075,7 +1098,7 @@ sub build_posting_display {
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] .= ' <a href="/adm/feedback?allversions='.$escsymb.':::'.$idx.'">'.&mt('Display all versions').'</a>';
}
$$discussionitems[$idx].='<br/>'.&mt('Earlier version(s) were posted on: ');
if ($contrib{$idx.':history'} =~ m/:/) {
@@ -1165,11 +1188,11 @@ sub get_post_contents {
# $$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'});
+ $$plainname=&Apache::loncommon::nickname(
+ $$contrib{$idx.':sendername'},
+ $$contrib{$idx.':senderdomain'});
+ $$screenname=$$contrib{$idx.':screenname'};
+
my $sender=&Apache::loncommon::aboutmewrapper(
$$plainname,
$$contrib{$idx.':sendername'},
@@ -1181,11 +1204,7 @@ sub get_post_contents {
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'}");
- }
+ @postversions = split(/:/,$$contrib{$idx.':history'});
}
&get_post_versions($messages,$$contrib{$idx.':message'},1);
&get_post_versions($subjects,$$contrib{$idx.':subject'},1);
@@ -1241,7 +1260,7 @@ END
}
}
if ($type eq 'allversions') {
- $discussion.=('</ul></body></html>');
+ $discussion.='</ul>';
return $discussion;
} else {
return;
@@ -1289,10 +1308,9 @@ sub replicate_attachments {
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']);
+ &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['subject','comment','currnewattach','addnewattach','deloldattach','delnewattach','timestamp','idx','anondiscuss','discuss','blog']);
}
- 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='';
@@ -1312,12 +1330,15 @@ sub mail_screen {
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'
- }
+ for (var i=0; i < document.mailform.discuss.length; i++) {
+ if (document.mailform.discuss[i].checked) {
+ document.attachment.discuss.value =
+ document.mailform.discuss[i].value;
+ }
+ }
+ if (document.mailform.blog.checked) {
+ document.attachment.blog.value = 1;
+ }
return
}
END
@@ -1325,13 +1346,15 @@ END
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
+ var disc = "$env{'form.discuss'}";
+ for (var i=0; i < document.mailform.discuss.length; i++) {
+ if (disc == document.mailform.discuss[i].value) {
+ document.mailform.discuss[i].checked = 1;
+ }
}
- if (disc == 1) {
- document.mailform.discuss.checked = true
+ var blog = "$env{'form.blog'}";
+ if (blog == 1) {
+ document.mailform.blog.checked=1;
}
return
}
@@ -1398,20 +1421,17 @@ END
$parentmsg = $contrib{$idx.':replyto'};
}
unless (exists($env{'form.origpage'})) {
- my $anonflag = 0;
+ my $anonflag = 'nonanon';
if ($contrib{$idx.':anonymous'}) {
- $anonflag = 1;
+ $anonflag = 'anon';
}
$anonscript = (<<END);
function setposttype () {
- var currtype = $anonflag
- if (currtype == 1) {
- document.mailform.elements.discuss.checked = false
- document.mailform.elements.anondiscuss.checked = true
- }
- if (currtype == 0) {
- document.mailform.elements.anondiscuss.checked = false
- document.mailform.elements.discuss.checked = true
+ var currtype = "$anonflag";
+ for (var i=0; i<document.mailform.discuss.length; i++) {
+ if (document.mailform.elements.discuss[i].value == currtype ) {
+ document.mailform.elements.discuss[i].checked=1;
+ }
}
return
}
@@ -1425,51 +1445,32 @@ END
}
if ($env{'form.origpage'}) {
- $subject = &Apache::lonnet::unescape($env{'form.subject'});
- $comment = &Apache::lonnet::unescape($env{'form.comment'});
+ $subject = &unescape($env{'form.subject'});
+ $comment = &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();
- $r->print(<<END);
-$html
-<head>
-<title>The LearningOnline Network with CAPA</title>
-<meta http-equiv="pragma" content="no-cache"></meta>
-$htmlheader
+ my $js= <<END;
<script type="text/javascript">
//<!--
function gosubmit() {
var rec=0;
- if (typeof(document.mailform.elements.author)!="undefined") {
- if (document.mailform.elements.author.checked) {
- rec=1;
- }
- }
- if (typeof(document.mailform.elements.question)!="undefined") {
- if (document.mailform.elements.question.checked) {
- rec=1;
- }
- }
- if (typeof(document.mailform.elements.course)!="undefined") {
- if (document.mailform.elements.course.checked) {
- rec=1;
- }
- }
- if (typeof(document.mailform.elements.policy)!="undefined") {
- if (document.mailform.elements.policy.checked) {
- rec=1;
- }
- }
if (typeof(document.mailform.elements.discuss)!="undefined") {
- if (document.mailform.elements.discuss.checked) {
- rec=1;
- }
- }
- if (typeof(document.mailform.elements.anondiscuss)!="undefined") {
- if (document.mailform.elements.anondiscuss.checked) {
+ if (typeof(document.mailform.elements.discuss.length) == "undefined") {
+ if (document.mailform.elements.discuss.checked ) {
+ rec=1;
+ }
+ } else {
+ for (var i=0; i<document.mailform.elements.discuss.length; i++) {
+ if (document.mailform.elements.discuss[i].checked ) {
+ rec=1;
+ }
+ }
+ }
+ }
+ if (typeof(document.mailform.elements.blog)!="undefined") {
+ if (document.mailform.elements.blog.checked) {
rec=1;
}
}
@@ -1480,15 +1481,22 @@ $htmlheader
}
document.mailform.submit();
} else {
- alert('Please check a feedback type.');
+ alert('Please select a feedback type.');
}
}
$anonchk
$anonscript
//-->
</script>
-</head>
-$bodytag
+END
+
+ my %onload = ('onload' => 'window.focus();setposttype();');
+ my $start_page=
+ &Apache::loncommon::start_page('Resource Feedback and Discussion',$js,
+ {'add_entries' => \%onload});
+
+ $r->print(<<END);
+$start_page
<h2><tt>$title</tt></h2>
<form action="/adm/feedback" method="post" name="mailform"
enctype="multipart/form-data">
@@ -1562,7 +1570,7 @@ END
$r->print(&generate_attachments_button($postidx,$attachnum,$ressymb,$now,\@currnewattach,\@currdelold,$numoldver));
if ($attachnum > 0) {
if (@currnewattach > 0) {
- $newattachmsg .= '<b>New attachments</b><br />';
+ $newattachmsg .= '<br /><b>New attachments</b><br />';
if (@currnewattach > 1) {
$newattachmsg .= '<ol>';
foreach my $item (@currnewattach) {
@@ -1585,7 +1593,8 @@ END
}
$r->print(&generate_preview_button().
&Apache::lonhtmlcommon::htmlareaselectactive('comment').
- '</body></html>');
+ &Apache::loncommon::end_page());
+
}
sub print_display_options {
@@ -1596,11 +1605,8 @@ sub print_display_options {
my $function = &Apache::loncommon::get_users_function();
my $tabcolor = &Apache::loncommon::designparm($function.'.tabbg',
$env{'user.domain'});
- my $bodytag=&Apache::loncommon::bodytag('Discussion options',
- '','');
my %lt = &Apache::lonlocal::texthash(
- 'dido' => 'Discussion display options',
'pref' => 'Display Preference',
'curr' => 'Current setting ',
'actn' => 'Action',
@@ -1658,13 +1664,9 @@ sub print_display_options {
$currtogg = $lt{'toggon'};
$disctogg = 'toggon';
}
- my $html=&Apache::lonxml::xmlbegin();
- $r->print(<<END);
-$html
-<head>
-<title>$lt{'dido'}</title>
-<meta http-equiv="pragma" content="no-cache" />
-<script>
+
+ my $js = <<END;
+<script type="text/javascript">
function discdispChk(caller) {
var disctogg = '$toggchg'
if (caller == 0) {
@@ -1731,46 +1733,53 @@ function setDisp() {
}
}
</script>
-</head>
-$bodytag
-<form name="modifydisp" method="post" action="/adm/feedback">
+END
+
+
+ my $start_page =
+ &Apache::loncommon::start_page('Discussion display options',$js);
+ my $end_page =
+ &Apache::loncommon::end_page();
+ $r->print(<<END);
+$start_page
+<form name="modifydisp" method="POST" action="/adm/feedback">
$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>
- <td width="100%" bgcolor="#000000">
- <table width="100%" border="0" cellpadding="1" cellspacing="0">
- <tr>
- <td width="100%" bgcolor="#000000">
- <table border="0" cellpadding="3" cellspacing="1" bgcolor="#FFFFFF">
- <tr bgcolor="$tabcolor">
- <td><b>$lt{'pref'}</b></td>
- <td><b>$lt{'curr'}</b></td>
- <td><b>$lt{'actn'}?</b></td>
+END
+ $r->print(&Apache::loncommon::start_data_table());
+ $r->print(<<END);
+ <tr>
+ <th>$lt{'pref'}</td>
+ <th>$lt{'curr'}</td>
+ <th>$lt{'actn'}?</td>
</tr>
- <tr bgcolor="#dddddd">
+END
+ $r->print(&Apache::loncommon::start_data_table_row());
+ $r->print(<<END);
<td>$lt{'disa'}</td>
<td>$lt{$discdisp}</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">
+END
+ $r->print(&Apache::loncommon::end_data_table_row());
+ $r->print(&Apache::loncommon::start_data_table_row());
+ $r->print(<<END);
<td>$lt{'npmr'}</td>
<td>$lt{$discmark}</td>
<td><label><input type="checkbox" name="discmark" />$lt{'chgt'} "$markchange"</label></td>
- </tr><tr bgcolor="#dddddd">
+END
+ $r->print(&Apache::loncommon::end_data_table_row());
+ $r->print(&Apache::loncommon::start_data_table_row());
+ $r->print(<<END);
<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>
- </tr>
- </table>
- </td>
-</tr>
-</table>
+END
+ $r->print(&Apache::loncommon::end_data_table_row());
+ $r->print(&Apache::loncommon::end_data_table());
+ $r->print(<<END);
<br />
<br />
<input type="hidden" name="symb" value="$symb" />
@@ -1783,8 +1792,7 @@ $lt{'sdpf'}<br/> $lt{'prca'} <ol><li>$l
<br />
<br />
</form>
-</body>
-</html>
+$end_page
END
return;
}
@@ -1796,23 +1804,21 @@ sub print_sortfilter_options {
$r->send_http_header;
&Apache::lonenc::check_encrypt(\$symb);
- my @sections = ();
+ my @sections;
my $section_sel = '';
- my $numsections = 0;
my $numvisible = 5;
- my %sectioncount = ();
-
- $numsections = &Apache::loncommon::get_sections($env{'course.'.$env{'request.course.id'}.'.domain'},$env{'course.'.$env{'request.course.id'}.'.num'},\%sectioncount);
+ my %sectioncount = &Apache::loncommon::get_sections();
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
- if ($numsections < 4) {
- $numvisible = $numsections + 1;
+ if (scalar(@sections) < 4) {
+ $numvisible = scalar(@sections) + 1;
}
+ unshift(@sections,'all'); # Put 'all' at the front of the list
+
}
foreach (@sections) {
$section_sel .= " <option value=\"$_\" />$_\n";
@@ -1821,10 +1827,7 @@ sub print_sortfilter_options {
my $function = &Apache::loncommon::get_users_function();
my $tabcolor = &Apache::loncommon::designparm($function.'.tabbg',
$env{'user.domain'});
- my $bodytag=&Apache::loncommon::bodytag('Discussion options',
- '','');
my %lt = &Apache::lonlocal::texthash(
- 'diso' => 'Discussion sorting and filtering options',
'diop' => 'Display Options',
'curr' => 'Current setting ',
'actn' => 'Action',
@@ -1841,12 +1844,8 @@ sub print_sortfilter_options {
my %role_types = ();
my %status_types = ();
&sort_filter_names(\%sort_types,\%role_types,\%status_types);
- my $html=&Apache::lonxml::xmlbegin();
- $r->print(<<END);
-$html
-<head>
-<title>$lt{'diso'}</title>
-<meta http-equiv="pragma" content="no-cache" />
+
+ my $js = <<END;
<script type="text/javascript">
function verifyFilter() {
var rolenum = 0
@@ -1871,9 +1870,16 @@ function verifyFilter() {
document.modifyshown.submit();
}
</script>
-</head>
-$bodytag
-<form name="modifyshown" method="post" action="/adm/feedback">
+END
+
+ my $start_page=
+ &Apache::loncommon::start_page('Discussion options',$js);
+ my $end_page=
+ &Apache::loncommon::end_page();
+
+ $r->print(<<END);
+$start_page
+<form name="modifyshown" method="POST" action="/adm/feedback">
<b>$lt{'diso'}</b><br/> $lt{'prca'}
<br /><br />
<table border="0">
@@ -1938,8 +1944,7 @@ $bodytag
<br />
<br />
</form>
-</body>
-</html>
+$end_page
END
}
@@ -1961,11 +1966,7 @@ sub print_showposters {
$env{'course.'.$env{'request.course.id'}.'.num'});
my %namesort = ();
my %postcounts = ();
- my %lt=&Apache::lonlocal::texthash(
- 'diso' => 'Discussion filtering options',
- );
- my $bodytag=&Apache::loncommon::bodytag('Discussion options',
- '','');
+
if ($contrib{'version'}) {
for (my $idx=1;$idx<=$contrib{'version'};$idx++) {
my $hidden=($contrib{'hidden'}=~/\.$idx\./);
@@ -1997,24 +1998,19 @@ sub print_showposters {
}
}
}
- my $html=&Apache::lonxml::xmlbegin();
+
+ my $start_page = &Apache::loncommon::start_page('Discussion options');
+ my $table_start =&Apache::loncommon::start_data_table();
$r->print(<<END);
-$html
-<head>
-<title>$lt{'diso'}</title>
-<meta http-equiv="pragma" content="no-cache" />
-</head>
-$bodytag
+$start_page
<form name="pickpostersform" method="post">
- <table border="0">
- <tr>
- <td bgcolor="#777777">
- <table border="0" cellpadding="3">
- <tr bgcolor="#e6ffff">
- <td><b>No.</b></td>
- <td><b>Select</b></td>
- <td><b>Fullname</b><font color="#999999">(Username/domain)</font></td>
- <td><b>Posts</td>
+ <br />
+ $table_start
+ <tr>
+ <th>No.</th>
+ <th>Select</th>
+ <th>Fullname<font color="#999999">(Username/domain)</font></th>
+ <th>Posts</th>
</tr>
END
my $count = 0;
@@ -2026,23 +2022,25 @@ END
next;
} else {
$count ++;
- $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>');
+ $r->print(&Apache::loncommon::start_data_table_row().
+ '<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>'.
+ &Apache::loncommon::end_data_table_row());
}
}
}
}
+ $r->print(&Apache::loncommon::end_data_table());
+ my $end_page = &Apache::loncommon::end_page();
$r->print(<<END);
- </table>
- </td>
- </tr>
- </table>
<br />
<input type="hidden" name="sortposts" value="$sortposts" />
<input type="hidden" name="userpick" value="$symb" />
<input type="button" name="store" value="Display posts" onClick="javascript:document.pickpostersform.submit()" />
</form>
-</body>
-</html>
+$end_page
END
}
@@ -2050,7 +2048,8 @@ sub get_post_versions {
my ($versions,$incoming,$htmldecode,$numver) = @_;
if ($incoming =~ /^<version num="0">/) {
my $p = HTML::LCParser->new(\$incoming);
- my $done = 0;
+ my $done = 0;
+
while ( (my $token = $p->get_tag("version")) && (!$done)) {
my $num = $token->[1]{num};
my $text = $p->get_text("/version");
@@ -2111,25 +2110,18 @@ 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();
- $r->print (<<ENDFAILREDIR);
-$html
-<head>
-<title>Feedback not sent</title>
-<meta http-equiv="pragma" content="no-cache" />
-<meta HTTP-EQUIV="Refresh" CONTENT="2; url=$feedurl" />
-</head>
-<body bgcolor="#FFFFFF">
+ $r->print(&Apache::loncommon::start_page('Feedback not sent',undef,
+ {'redirect' => [2,$feedurl],
+ 'only_body' => 1,}));
+ $r->print(<<ENDFAILREDIR);
<img align="right" src="$logo" />
<b>Sorry, no recipients ...</b>
-<br /><a href="$feedurl">Continue</a>
-</body>
-</html>
ENDFAILREDIR
+ $r->print(&Apache::loncommon::end_page());
}
sub redirect_back {
- my ($r,$feedurl,$typestyle,$sendsomething,$sendposts,$status,$previous,$sort,$rolefilter,$statusfilter,$sectionpick,$numpicks) = @_;
+ my ($r,$feedurl,$typestyle,$sendsomething,$sendposts,$blog,$status,$previous,$sort,$rolefilter,$statusfilter,$sectionpick,$numpicks) = @_;
my $sorttag = '';
my $roletag = '';
my $statustag = '';
@@ -2199,18 +2191,24 @@ sub redirect_back {
}
$feedurl=&Apache::lonenc::check_encrypt($feedurl);
my $logo=&Apache::loncommon::lonhttpdurl('/adm/lonIcons/lonlogos.gif');
- my $html=&Apache::lonxml::xmlbegin();
- $r->print (<<ENDREDIR);
-$html
-<head>
-<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(); }'>
+ my %onload;
+ if ($env{'environment.remote'} ne 'off') {
+ $onload{'onload'} =
+ "if (window.name!='loncapaclient') { this.document.reldt.submit(); self.window.close(); }";
+ }
+ my $start_page=
+ &Apache::loncommon::start_page('New posts marked as read',undef,
+ {'redirect' => [2,$feedurl],
+ 'only_body' => 1,
+ 'add_entries' => \%onload});
+ my $end_page = &Apache::loncommon::end_page();
+
+ $r->print(<<ENDREDIR);
+$start_page
<img align="right" src="$logo" />
$typestyle
<b>Sent $sendsomething message(s), and $sendposts post(s).</b>
+$blog
<font color="red">$status</font>
<form name="reldt" action="$feedurl" target="loncapaclient">
$prevtag
@@ -2220,38 +2218,41 @@ $roletag
$sectag
$userpicktag
</form>
-<br /><a href="$feedurl">Continue</a>
-</body>
-</html>
+$end_page
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();
- $r->print (<<ENDNOREDIR);
-$html
-<head>
-<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='.
- &Apache::lonenc::check_encrypt($feedurl).'">');
- }
+
+ my %onload;
+ if ($env{'environment.remote'} ne 'off') {
+ $onload{'onload'} =
+ "if (window.name!='loncapaclient') { self.window.close(); }";
+ }
+
+ my %body_options = ('only_body' => 1,
+ 'bgcolor' => '#FFFFFF',
+ 'add_entries' => \%onload,);
+
+ if ($feedurl !~ m{^/adm/feedback}) {
+ $body_options{'rediect'} = [2,$feedurl];
+ }
+ my $start_page=
+ &Apache::loncommon::start_page('Feedback not sent',undef,
+ \%body_options);
+
+ my $end_page = &Apache::loncommon::end_page();
+
$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(); }'>
+$start_page
<img align="right" src="$logo" />
<b>$nofeed</b>
-<br /><a href="$feedurl">$continue</a>
-</body>
-</html>
+<br />
+$end_page
ENDNOREDIRTWO
}
@@ -2262,39 +2263,41 @@ sub screen_header {
unless (($env{'form.replydisc'}) || ($env{'form.editdisc'})) {
if (($feedurl=~/^\/res\//) && ($feedurl!~/^\/res\/adm/) && ($env{'user.adv'})) {
$msgoptions=
- '<p><label><input type="checkbox" name="author" /> '.
+ '<p><label><input type="radio" name="discuss" value="author" /> '.
&mt('Feedback to resource author').'</label></p>';
}
if (&feedback_available(1)) {
$msgoptions.=
- '<p><label><input type="checkbox" name="question" /> '.
+ '<p><label><input type="radio" name="discuss" value="question" /> '.
&mt('Question about resource content').'</label></p>';
}
if (&feedback_available(0,1)) {
$msgoptions.=
- '<p><label><input type="checkbox" name="course" /> '.
+ '<p><label><input type="radio" name="discuss" value="course" /> '.
&mt('Question/Comment/Feedback about course content').
'</label></p>';
}
if (&feedback_available(0,0,1)) {
$msgoptions.=
- '<p><label><input type="checkbox" name="policy" /> '.
+ '<p><label><input type="radio" name="discuss" value="policy" /> '.
&mt('Question/Comment/Feedback about course policy').
'</label></p>';
}
}
- if ($env{'request.course.id'}) {
+ if (($env{'request.course.id'}) && (!$env{'form.sendmessageonly'})) {
if (&discussion_open(undef,$symb) &&
&Apache::lonnet::allowed('pch',
$env{'request.course.id'}.
($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''))) {
- $discussoptions='<label><input type="checkbox" name="discuss" onClick="this.form.anondiscuss.checked=false;" '.
- ($env{'form.replydisc'}?' checked="1"':'').' /> '.
+ $discussoptions='<label><input type="radio" name="discuss" value="nonanon" checked="checked" /> '.
&mt('Contribution to course discussion of resource');
- $discussoptions.='</label><br /><label><input type="checkbox" name="anondiscuss" onClick="this.form.discuss.checked=false;" /> '.
+ $discussoptions.='</label><br /><label><input type="radio" name="discuss" value="anon" /> '.
&mt('Anonymous contribution to course discussion of resource').
- ' <i>('.&mt('name only visible to course faculty').')</i></label>';
+ ' <i>('.&mt('name only visible to course faculty').')</i></label> '.
+ '<a href="/adm/preferences?action=changescreenname">'.&mt('Change Screenname').'</a>';
}
+ $discussoptions.='<br /><label><input type="checkbox" name="blog" /> '.
+ &mt('Add to my public course blog').'</label>';
}
if ($msgoptions) { $msgoptions='<h2><img src="'.&Apache::loncommon::lonhttpdurl('/adm/lonMisc/feedback.gif').'" />'.&mt('Sending Messages').'</h2>'.$msgoptions; }
if ($discussoptions) {
@@ -2316,8 +2319,9 @@ sub resource_output {
}
sub clear_out_html {
- my ($message,$override)=@_;
- unless (&Apache::lonhtmlcommon::htmlareablocked()) { return $message; }
+ my ($message,$override,$ignore_htmlarea)=@_;
+ if (!$ignore_htmlarea
+ && !&Apache::lonhtmlcommon::htmlareablocked()) { return $message; }
# Always allow the <m>-tag
my %html=(M=>1);
# Check if more is allowed
@@ -2333,9 +2337,9 @@ sub clear_out_html {
H1=>1, H2=>1, H3=>1, H4=>1, H5=>1);
}
# Do the substitution of everything that is not explicitly allowed
- $message =~ s/\<(\/?\s*(\w+)[^\>\<]*)/
+ $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;
return $message;
}
@@ -2411,13 +2415,13 @@ sub decide_receiver {
my ($feedurl,$author,$question,$course,$policy,$defaultflag) = @_;
my $typestyle='';
my %to=();
- if ($env{'form.author'}||$author) {
+ if ($env{'form.discuss'} eq 'author' ||$author) {
$typestyle.='Submitting as Author Feedback<br />';
$feedurl=~/^\/res\/(\w+)\/(\w+)\//;
$to{$2.':'.$1}=1;
}
- if ($env{'form.question'}||$question) {
- $typestyle.='Submitting as Question<br />';
+ if ($env{'form.discuss'} eq 'question' ||$question) {
+ $typestyle.=&mt('Submitting as Question').'<br />';
foreach (split(/\,/,
$env{'course.'.$env{'request.course.id'}.'.question.email'})
) {
@@ -2425,8 +2429,8 @@ sub decide_receiver {
if ($rec) { $to{$rec}=1; }
}
}
- if ($env{'form.course'}||$course) {
- $typestyle.='Submitting as Comment<br />';
+ if ($env{'form.discuss'} eq 'course' ||$course) {
+ $typestyle.=&mt('Submitting as Comment').'<br />';
foreach (split(/\,/,
$env{'course.'.$env{'request.course.id'}.'.comment.email'})
) {
@@ -2434,8 +2438,8 @@ sub decide_receiver {
if ($rec) { $to{$rec}=1; }
}
}
- if ($env{'form.policy'}||$policy) {
- $typestyle.='Submitting as Policy Feedback<br />';
+ if ($env{'form.discuss'} eq 'policy' ||$policy) {
+ $typestyle.=&mt('Submitting as Policy Feedback').'<br />';
foreach (split(/\,/,
$env{'course.'.$env{'request.course.id'}.'.policy.email'})
) {
@@ -2457,14 +2461,16 @@ sub feedback_available {
}
sub send_msg {
- my ($feedurl,$email,$citations,$attachmenturl,%to)=@_;
+ my ($title,$feedurl,$email,$citations,$attachmenturl,%to)=@_;
my $status='';
my $sendsomething=0;
+ if ($title=~/^Error/) { $title=&mt('Feedback').': '.$title; }
+ unless ($title=~/\w/) { $title=&mt('Feedback'); }
foreach (keys %to) {
if ($_) {
my $declutter=&Apache::lonnet::declutter($feedurl);
unless (&Apache::lonmsg::user_normal_msg(split(/\:/,$_),
- 'Feedback ['.$declutter.']',$email,$citations,$feedurl,
+ $title.' ['.$declutter.']',$email,$citations,$feedurl,
$attachmenturl)=~/ok/) {
$status.='<br />'.&mt('Error sending message to').' '.$_.'<br />';
} else {
@@ -2518,7 +2524,6 @@ sub adddiscuss {
}
if (($symb) && ($email)) {
if ($env{'form.editdisc'}) {
- my %newcontrib = ();
$contrib{'ip'}=$ENV{'REMOTE_ADDR'};
$contrib{'host'}=$Apache::lonnet::perlvar{'lonHostID'};
$contrib{'timestamp'} = time;
@@ -2561,12 +2566,8 @@ sub adddiscuss {
}
}
$contrib{'history'} .= $oldcontrib{$oldidx.':timestamp'};
- foreach (keys %contrib) {
- my $key = $oldidx.':'.&Apache::lonnet::escape($oldsymb).':'.$_;
- $newcontrib{$key} = $contrib{$_};
- }
my $put_reply = &Apache::lonnet::putstore($env{'request.course.id'},
- \%newcontrib,
+ $oldsymb,$oldidx,\%contrib,
$env{'course.'.$env{'request.course.id'}.'.domain'},
$env{'course.'.$env{'request.course.id'}.'.num'});
$status='Editing class discussion'.($anon?' (anonymous)':'');
@@ -2600,21 +2601,25 @@ sub adddiscuss {
# ----------------------------------------------------------- Preview function
sub show_preview {
- my $r=shift;
+ my ($r) = @_;
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
my $message=&clear_out_html($env{'form.comment'});
&newline_to_br(\$message);
$message=&Apache::lonspeller::markeduptext($message);
$message=&Apache::lontexconvert::msgtexconverted($message);
- my $subject=&clear_out_html($env{'form.subject'});
+ my $subject=&clear_out_html($env{'form.subject'},undef,1);
$subject=~s/\n/\<br \/\>/g;
$subject=&Apache::lontexconvert::msgtexconverted($subject);
- my $html=&Apache::lonxml::xmlbegin();
- $r->print($html.'<head>'.
- '</head><body><table border="2"><tr><td>'.
+ my $start_page=
+ &Apache::loncommon::start_page('Preview',undef,
+ {'only_body' => 1,});
+
+ my $end_page = &Apache::loncommon::end_page();
+
+ $r->print($start_page.'<table border="2"><tr><td>'.
'<b>Subject:</b> '.$subject.'<br /><br />'.
- $message.'</td></tr></table></body></html>');
+ $message.'</td></tr></table>'.$end_page);
}
@@ -2640,27 +2645,30 @@ sub newline_to_br {
}
sub generate_preview_button {
+ my ($formname,$fieldname)=@_;
+ unless ($formname) { $formname='mailform'; }
+ unless ($fieldname) { $fieldname='comment'; }
my $pre=&mt("Show Preview and Check Spelling");
return(<<ENDPREVIEW);
+<br />
<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)=='function') {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.$formname.onsubmit)=='function') {document.$formname.onsubmit();};this.form.comment.value=document.$formname.$fieldname.value;this.form.subject.value=document.$formname.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);
+ my $orig_subject = &unescape($env{'form.subject'});
+ my $subject=&clear_out_html($orig_subject,undef,1);
$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 = ();
@@ -2668,19 +2676,22 @@ sub modify_attachments {
&extract_attachments($attachmenturls,$idx,$numoldver,\$msg,\%attachments,\%currattach,$currdelold);
}
&Apache::lonenc::check_encrypt(\$symb);
- my $html=&Apache::lonxml::xmlbegin();
- $r->print(<<END);
-$html
-<head>
-<title>Managing Attachments</title>
-<script>
+ my $js = <<END;
+<script type="text/javascript">
function setAction () {
document.modattachments.action = document.modattachments.origpage.value;
document.modattachments.submit();
}
</script>
-</head>
-$bodytag
+END
+
+ my $start_page =
+ &Apache::loncommon::start_page('Discussion Post Attachments',$js);
+ my $end_page =
+ &Apache::loncommon::end_page();
+
+ $r->print(<<END);
+$start_page
<form name="modattachments" method="post" enctype="multipart/form-data" action="/adm/feedback?attach=$symb">
<table border="2">
<tr>
@@ -2720,7 +2731,7 @@ END
<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="blog" value="$env{'form.blog'}" />
<input type="hidden" name="discuss" value="$env{'form.discuss'}" />
END
foreach (@{$currnewattach}) {
@@ -2732,8 +2743,7 @@ END
$r->print(<<END);
<input type="button" name="rtntoedit" value="Store Changes" onClick="setAction()"/>
</form>
-</body>
-</html>
+$end_page
END
return;
}
@@ -2771,6 +2781,7 @@ sub generate_attachments_button {
my $origpage = $ENV{'REQUEST_URI'};
my $att=$attachnum.' '.&mt("attachments");
my $response = (<<END);
+<br />
<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);
@@ -2785,7 +2796,7 @@ this.form.submit();" />
<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="blog" value = "0" />
<input type="hidden" name="discuss" value = "0" />
<input type="hidden" name="numoldver" value="$numoldver" />
ENDATTACH
@@ -2965,8 +2976,16 @@ 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','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']);
-
+ ['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','sendmessageonly']);
+ if ($env{'form.editdisc'}) {
+ if (!(&editing_allowed())) {
+ my $symb=(split(/\:\:\:/,$env{'form.editdisc'}))[0];
+ my ($map,$id,$url)=&Apache::lonnet::decode_symb($symb);
+ my $feedurl=&Apache::lonnet::clutter($url);
+ &redirect_back($r,$feedurl,&mt('Editing not permitted').'<br />', '0','0','','',$env{'form.previous'},'','','',);
+ return OK;
+ }
+ }
if ($env{'form.discsymb'}) {
my ($symb,$feedurl) = &get_feedurl_and_clean_symb($env{'form.discsymb'});
my $readkey = $symb.'_read';
@@ -2990,22 +3009,16 @@ sub handler {
\%readinghash,$env{'user.domain'},$env{'user.name'});
}
&redirect_back($r,$feedurl,&mt('Marked postings read/unread').'<br />',
- '0','0','',$env{'form.previous'},'','','',);
+ '0','0','','',$env{'form.previous'},'','','',);
return OK;
}
if ($env{'form.allversions'}) {
&Apache::loncommon::content_type($r,'text/html');
+ &Apache::loncommon::no_cache($r);
$r->send_http_header;
- my $html=&Apache::lonxml::xmlbegin();
- my $bodytag=&Apache::loncommon::bodytag('Discussion Post Versions');
- $r->print(<<END);
-$html
-<head>
-<title>Post Versions</title>
-<meta http-equiv="pragma" content="no-cache" />
-</head>
-$bodytag
-END
+
+ $r->print(&Apache::loncommon::start_page('Discussion Post Versions'));
+
my $crs='/'.$env{'request.course.id'};
if ($env{'request.course.sec'}) {
$crs.='_'.$env{'request.course.sec'};
@@ -3026,6 +3039,7 @@ END
$env{'course.'.$env{'request.course.id'}.'.num'});
$r->print(&get_post_contents(\%contrib,$idx,$seeid,'allversions',\%messages,\%subjects,\%allattachments,\%attachmsgs,\%imsfiles,\$screenname,\$plainname));
}
+ $r->print(&Apache::loncommon::end_page());
return OK;
}
if ($env{'form.posterlist'}) {
@@ -3042,14 +3056,14 @@ END
$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',
+ &redirect_back($r,$feedurl,&mt('Changed sort/filter').'<br />','0','0','',
'',$env{'form.previous'},$env{'form.sortposts'},'','','',
$numpicks);
return OK;
}
if ($env{'form.applysort'}) {
my ($symb,$feedurl)=&get_feedurl_and_clean_symb($env{'form.applysort'});
- &redirect_back($r,$feedurl,&mt('Changed sort/filter').'<br />','0','0',
+ &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'});
@@ -3094,22 +3108,26 @@ END
&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 %onload;
+ if ($env{'environment.remote'} ne 'off') {
+ $onload{'onload'} =
+ "if (window.name!='loncapaclient') { this.document.reldt.submit(); self.window.close(); }";
+ }
+
+ my $start_page=
+ &Apache::loncommon::start_page('New posts marked as read',undef,
+ {'redirect' => [2,$feedurl],
+ 'only_body' => 1,
+ 'add_entries' => \%onload});
+ my $end_page = &Apache::loncommon::end_page();
$r->print (<<ENDREDIR);
-$html
-<head>
-<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(); }'>
+$start_page
<img align="right" src="$logo" />
$textline
<form name="reldt" action="$feedurl" target="loncapaclient">
</form>
-<br /><a href="$feedurl">Continue</a>
-</body>
-</html>
+<br />
+$end_page
ENDREDIR
return OK;
} elsif ($env{'form.modifydisp'}) {
@@ -3153,7 +3171,7 @@ ENDREDIR
my $previous=$env{'form.previous'};
if ($env{'form.markondisp'}) { $previous=undef; }
&redirect_back($r,$feedurl,&mt('Changed display status').'<br />',
- '0','0','',$previous);
+ '0','0','','',$previous);
return OK;
} elsif (($env{'form.hide'}) || ($env{'form.unhide'})) {
# ----------------------------------------------------------------- Hide/unhide
@@ -3161,6 +3179,18 @@ ENDREDIR
my ($symb,$idx)=split(/\:\:\:/,$entry);
($symb,my $feedurl)=&get_feedurl_and_clean_symb($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);
+
+ if ($env{'form.hide'} && !$seeid && !(&editing_allowed())) {
+ &redirect_back($r,$feedurl,&mt('Deletion not permitted').'<br />', '0','0','','',$env{'form.previous'},'','','',);
+ return OK;
+ }
+
my %contrib=&Apache::lonnet::restore($symb,$env{'request.course.id'},
$env{'course.'.$env{'request.course.id'}.'.domain'},
$env{'course.'.$env{'request.course.id'}.'.num'});
@@ -3168,13 +3198,6 @@ ENDREDIR
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) {
@@ -3193,7 +3216,7 @@ ENDREDIR
$env{'course.'.$env{'request.course.id'}.'.num'});
&redirect_back($r,$feedurl,&mt('Changed discussion status').'<br />',
- '0','0','',$env{'form.previous'});
+ '0','0','','',$env{'form.previous'});
return OK;
} elsif ($env{'form.cmd'}=~/^(threadedoff|threadedon)$/) {
my ($symb,$feedurl)=&get_feedurl_and_clean_symb($env{'form.symb'});
@@ -3205,7 +3228,7 @@ ENDREDIR
&Apache::lonnet::delenv('environment\.threadeddiscussion');
}
&redirect_back($r,$feedurl,&mt('Changed discussion view mode').'<br />',
- '0','0','',$env{'form.previous'});
+ '0','0','','',$env{'form.previous'});
return OK;
} elsif ($env{'form.deldisc'}) {
# --------------------------------------------------------------- Hide for good
@@ -3219,7 +3242,7 @@ ENDREDIR
$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'});
+ '0','0','','',$env{'form.previous'});
return OK;
} elsif ($env{'form.preview'}) {
# -------------------------------------------------------- User wants a preview
@@ -3229,7 +3252,7 @@ ENDREDIR
# -------------------------------------------------------- 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']);
+ &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['subject','comment','addnewattach','delnewattach','timestamp','numoldver','idx','discuss','blog']);
my (@currnewattach,@currdelold,@keepold);
&process_attachments(\@currnewattach,\@currdelold,\@keepold);
if (exists($env{'form.addnewattach.filename'})) {
@@ -3263,8 +3286,11 @@ ENDREDIR
$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);
+ my $start_page =
+ &Apache::loncommon::start_page('Resource Feedback and Discussion');
+ my $end_page =
+ &Apache::loncommon::end_page();
+ $r->print($start_page.$discussion.$end_page);
return OK;
} else {
# ------------------------------------------------------------- Normal feedback
@@ -3321,6 +3347,7 @@ ENDREDIR
$r->send_http_header;
# Unable to give feedback
&no_redirect_back($r,$feedurl);
+ return OK;
}
# --------------------------------------------------- Print login screen header
unless ($env{'form.sendit'}) {
@@ -3384,22 +3411,37 @@ ENDREDIR
my ($typestyle,%to) = &decide_receiver($feedurl);
# Actually send mail
- my ($status,$numsent)=&send_msg($feedurl,$email,$citations,
+ my ($status,$numsent)=&send_msg(&clear_out_html($env{'form.subject'},
+ undef,1),
+ $feedurl,$email,$citations,
$attachmenturl,%to);
# Discussion? Store that.
my $numpost=0;
- if ($env{'form.discuss'} || $env{'form.anondiscuss'}) {
- my $subject = &clear_out_html($env{'form.subject'});
- my $anonmode=(defined($env{'form.anondiscuss'}));
+ if ($env{'form.discuss'} =~/^(?:non|)anon$/
+ || $env{'form.anondiscuss'}) {
+ my $subject = &clear_out_html($env{'form.subject'},undef,1);
+ my $anonmode=($env{'form.discuss'} eq 'anon' || $env{'form.anondiscuss'} );
$typestyle.=&adddiscuss($symb,$message,$anonmode,$attachmenturl,
$subject);
$numpost++;
}
+
+# Add to blog?
+
+ my $blog='';
+ if ($env{'form.blog'}) {
+ my $subject = &clear_out_html($env{'form.subject'},undef,1);
+ $status.=&Apache::lonrss::addentry($env{'user.name'},
+ $env{'user.domain'},
+ 'CourseBlog_'.$env{'request.course.id'},
+ $subject,$message,$feedurl,'public');
+ $blog='<br />'.&mt('Added to my course blog').'<br />';
+ }
# Receipt screen and redirect back to where came from
- &redirect_back($r,$feedurl,$typestyle,$numsent,$numpost,$status,$env{'form.previous'});
+ &redirect_back($r,$feedurl,$typestyle,$numsent,$numpost,$blog,$status,$env{'form.previous'});
}
return OK;
}
@@ -3438,5 +3480,34 @@ sub get_feedurl_and_clean_symb {
my $feedurl = &get_feedurl($symb);
return ($symb,$feedurl);
}
+
+sub editing_allowed {
+ my $can_edit = 0;
+ my $cid = $env{'request.course.id'};
+ my $role = (split(/\./,$env{'request.role'}))[0];
+ my $section = $env{'request.course.sec'};
+ my $allow_editing_config =
+ $env{'course.'.$cid.'.allow_discussion_post_editing'};
+ if ($allow_editing_config =~ m/^\s*yes\s*$/i) {
+ $can_edit = 1;
+ } else {
+ foreach my $editor (split(/,/,$allow_editing_config)) {
+ my ($editor_role,$editor_sec) = split(/:/,$editor);
+ if ($editor_role eq $role
+ && defined($editor_sec)
+ && defined($section)
+ && $editor_sec eq $section) {
+ $can_edit = 1;
+ last;
+ }
+ if ($editor_role eq $role
+ && !defined($editor_sec)) {
+ $can_edit = 1;
+ }
+ }
+ }
+ return $can_edit;
+}
+
1;
__END__