--- loncom/interface/lonfeedback.pm 2005/02/17 04:39:58 1.152
+++ loncom/interface/lonfeedback.pm 2006/03/06 19:21:22 1.183
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Feedback
#
-# $Id: lonfeedback.pm,v 1.152 2005/02/17 04:39:58 albertel Exp $
+# $Id: lonfeedback.pm,v 1.183 2006/03/06 19:21:22 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -35,15 +35,18 @@ use Apache::lonmsg();
use Apache::loncommon();
use Apache::lontexconvert();
use Apache::lonlocal; # must not have ()
+use Apache::lonnet;
use Apache::lonhtmlcommon();
use Apache::lonnavmaps;
use Apache::lonenc();
+use Apache::lonrss();
use HTML::LCParser();
use Apache::lonspeller();
use Cwd;
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')) {
@@ -61,7 +64,7 @@ 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)) {
- if (!$ENV{'request.role.adv'}) { return 0; }
+ if (!$env{'request.role.adv'}) { return 0; }
}
}
return 1;
@@ -69,9 +72,9 @@ sub discussion_visible {
sub list_discussion {
my ($mode,$status,$ressymb,$imsextras)=@_;
- my $outputtarget=$ENV{'form.grade_target'};
- if (defined($ENV{'form.export'})) {
- if($ENV{'form.export'}) {
+ my $outputtarget=$env{'form.grade_target'};
+ if (defined($env{'form.export'})) {
+ if($env{'form.export'}) {
$outputtarget = 'export';
}
}
@@ -84,11 +87,11 @@ sub list_discussion {
my @bgcols = ("#cccccc","#eeeeee");
my $discussiononly=0;
if ($mode eq 'board') { $discussiononly=1; }
- unless ($ENV{'request.course.id'}) { return ''; }
- my $crs='/'.$ENV{'request.course.id'};
- my $cid=$ENV{'request.course.id'};
- if ($ENV{'request.course.sec'}) {
- $crs.='_'.$ENV{'request.course.sec'};
+ unless ($env{'request.course.id'}) { return ''; }
+ my $crs='/'.$env{'request.course.id'};
+ my $cid=$env{'request.course.id'};
+ if ($env{'request.course.sec'}) {
+ $crs.='_'.$env{'request.course.sec'};
}
$crs=~s/\_/\//g;
unless ($ressymb) { $ressymb=&Apache::lonnet::symbread(); }
@@ -96,7 +99,7 @@ sub list_discussion {
$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)$/));
+ && ($ressymb=~/\.(problem|exam|quiz|assess|survey|form|task)$/));
my %usernamesort = ();
my %namesort =();
@@ -112,7 +115,7 @@ sub list_discussion {
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 %dischash = &Apache::lonnet::get('nohist_'.$cid.'_discuss',[$lastkey,$showkey,$markkey,$visitkey,$ondispkey,$userpickkey,$toggkey,$readkey],$env{'user.domain'},$env{'user.name'});
my %discinfo = ();
my $showonlyunread = 0;
my $showunmark = 0;
@@ -125,22 +128,22 @@ 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 $statusfilter = $ENV{'form.statusfilter'};
+ my $sortposts = $env{'form.sortposts'};
+ my $statusfilter = $env{'form.statusfilter'};
my @sectionpick = ();
- if ($ENV{'form.sectionpick'} =~ /,/) {
- @sectionpick = split/,/,$ENV{'form.sectionpick'};
+ if ($env{'form.sectionpick'} =~ /,/) {
+ @sectionpick = split/,/,$env{'form.sectionpick'};
} else {
- $sectionpick[0] = $ENV{'form.sectionpick'};
+ $sectionpick[0] = $env{'form.sectionpick'};
}
my @rolefilter = ();
- if ($ENV{'form.rolefilter'} =~ /,/) {
- @rolefilter = split/,/,$ENV{'form.rolefilter'};
+ if ($env{'form.rolefilter'} =~ /,/) {
+ @rolefilter = split/,/,$env{'form.rolefilter'};
} else {
- $rolefilter[0] = $ENV{'form.rolefilter'};
+ $rolefilter[0] = $env{'form.rolefilter'};
}
- my $totposters = $ENV{'form.totposters'};
- $previous = $ENV{'form.previous'};
+ my $totposters = $env{'form.totposters'};
+ $previous = $env{'form.previous'};
if ($previous > 0) {
$prevread = $previous;
} elsif (defined($dischash{$lastkey})) {
@@ -152,8 +155,10 @@ sub list_discussion {
# Get information about students and non-students in course for filtering display of posts
my %roleshash = ();
my %roleinfo = ();
- if ($ENV{'form.rolefilter'}) {
- %roleshash = &Apache::lonnet::dump('nohist_userroles',$ENV{'course.'.$ENV{'request.course.id'}.'.domain'},$ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+ if ($env{'form.rolefilter'}) {
+ %roleshash = &Apache::lonnet::dump('nohist_userroles',
+ $env{'course.'.$cid.'.domain'},
+ $env{'course.'.$cid.'.num'});
foreach (keys %roleshash) {
my ($role,$uname,$udom,$sec) = split/:/,$_;
if ($role =~ /^cr/) {
@@ -170,9 +175,8 @@ sub list_discussion {
}
}
my ($classlist) = &Apache::loncoursedata::get_classlist(
- $ENV{'request.course.id'},
- $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
- $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+ $env{'course.'.$cid.'.domain'},
+ $env{'course.'.$cid.'.num'});
my $sec_index = &Apache::loncoursedata::CL_SECTION();
my $status_index = &Apache::loncoursedata::CL_STATUS();
while (my ($student,$data) = each %$classlist) {
@@ -183,10 +187,10 @@ sub list_discussion {
}
# Get discussion display default settings for user
- if ($ENV{'environment.discdisplay'} eq 'unread') {
+ if ($env{'environment.discdisplay'} eq 'unread') {
$showonlyunread = 1;
}
- if ($ENV{'environment.discmarkread'} eq 'ondisp') {
+ if ($env{'environment.discmarkread'} eq 'ondisp') {
$markondisp = 1;
}
@@ -234,18 +238,19 @@ 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' ) {
+ unless ($env{'browser.interface'} eq 'textual' ||
+ $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'});
- &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);
+ &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,\%anonhash,$anoncnt);
my $discussion='';
my $manifestfile;
@@ -256,7 +261,7 @@ sub list_discussion {
my $function = &Apache::loncommon::get_users_function();
my $color = &Apache::loncommon::designparm($function.'.tabbg',
- $ENV{'user.domain'});
+ $env{'user.domain'});
my %lt = &Apache::lonlocal::texthash(
'cuse' => 'Current discussion settings',
'allposts' => 'All posts',
@@ -322,11 +327,11 @@ sub list_discussion {
if ($visible) {
# Print the discusssion
if ($outputtarget eq 'tex') {
- $discussion.='<tex>\vskip 0 mm\noindent\makebox[2 cm][b]{\hrulefill}'.
+ $discussion.='<tex>{\tiny \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>';
+ '\noindent\textbf{'.$lt{'npce'}.'}: \textit{'.$currmark.'}}</tex>';
} elsif ($outputtarget eq 'export') {
# Create temporary directory if this is an export
my $now = time;
@@ -348,7 +353,7 @@ sub list_discussion {
if (!-e $tempexport) {
mkdir($tempexport,0700);
}
- $tempexport .= '/'.$ENV{'user.domain'}.'_'.$ENV{'user.name'};
+ $tempexport .= '/'.$env{'user.domain'}.'_'.$env{'user.name'};
}
if (!-e $tempexport) {
mkdir($tempexport,0700);
@@ -389,19 +394,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=&Apache::lonnet::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;
}
@@ -409,14 +415,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>';
}
@@ -429,7 +437,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;
}
@@ -472,7 +480,7 @@ imscp_v1p1.xsd http://www.imsglobal.org/
my $currdepth = 0;
my $firstidx = $alldiscussion{$showposts[0]};
foreach (@showposts) {
- unless (($sortposts eq 'thread') || (($sortposts eq '') && ($ENV{'environment.threadeddiscussion'})) || ($outputtarget eq 'export')) {
+ unless (($sortposts eq 'thread') || (($sortposts eq '') && ($env{'environment.threadeddiscussion'})) || ($outputtarget eq 'export')) {
$alldiscussion{$_} = $_;
}
unless ( ($notshown{$alldiscussion{$_}} eq '1') || ($shown{$alldiscussion{$_}} == 0) ) {
@@ -584,7 +592,7 @@ END
&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'})) {
+ if (defined($env{'form.totposters'})) {
$discussion .= &mt('Posts by').':';
if ($totposters > 0) {
foreach my $poster (@posters) {
@@ -598,7 +606,7 @@ END
} else {
my $filterchoice ='';
if (@sectionpick > 0) {
- $filterchoice = '<i>'.&mt('sections').'</i>- '.$ENV{'form.sectionpick'};
+ $filterchoice = '<i>'.&mt('sections').'</i>- '.$env{'form.sectionpick'};
$filterchoice .= ' ';
}
if (@rolefilter > 0) {
@@ -657,20 +665,14 @@ END
#Create zip file in prtspool
my $imszipfile = '/prtspool/'.
- $ENV{'user.name'}.'_'.$ENV{'user.domain'}.'_'.
+ $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;
@@ -690,10 +692,10 @@ END
my @currdelold = ();
my $comment = '';
my $subject = '';
- if ($ENV{'form.origpage'}) {
+ 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 = &Apache::lonnet::unescape($env{'form.subject'});
+ $comment = &Apache::lonnet::unescape($env{'form.comment'});
my @keepold = ();
&process_attachments(\@currnewattach,\@currdelold,\@keepold);
if (@currnewattach > 0) {
@@ -714,8 +716,8 @@ to course faculty</font><br />
<b>Title:</b> <input type="text" name="subject" value="$subject" size="30" /><br /><br />
<textarea name="comment" cols="80" rows="14" wrap="hard">$comment</textarea>
ENDDISCUSS
- if ($ENV{'form.origpage'}) {
- $discussion.='<input type="hidden" name="origpage" value="'.$ENV{'form.origpage'}.'" />'."\n";
+ 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";
}
@@ -744,11 +746,11 @@ ENDDISCUSS
} else {
if (&discussion_open($status) &&
&Apache::lonnet::allowed('pch',
- $ENV{'request.course.id'}.
- ($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:''))) {
+ $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.'>'.
+ &Apache::lonnet::escape($ressymb).':::" '.$target.'>'.
'<img src="'.&Apache::loncommon::lonhttpdurl('/adm/lonMisc/chat.gif').'" border="0" />'.
&mt('Post Discussion').'</a></td></tr></table>';
}
@@ -758,13 +760,14 @@ ENDDISCUSS
}
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 %contrib=&Apache::lonnet::restore($symb,$ENV{'request.course.id'},
- $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
- $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+ my $escsymb=&Apache::lonnet::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'});
if ($contrib{'version'}) {
my $oldest = $contrib{'1:timestamp'};
@@ -788,7 +791,7 @@ sub build_posting_display {
my $origindex='0.';
my $numoldver=0;
if ($contrib{$idx.':replyto'}) {
- if ( (($ENV{'environment.threadeddiscussion'}) && ($sortposts eq '')) || ($sortposts eq 'thread') || ($outputtarget eq 'export')) {
+ 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;
@@ -825,6 +828,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);
@@ -863,7 +873,7 @@ sub build_posting_display {
$contrib{$idx.':sendername'}.' at '.
$contrib{$idx.':senderdomain'}.')';
if ($contrib{$idx.':anonymous'}) {
- $sender.=' ['.&mt('anonymous').'] '.
+ $sender.=' <font color="red"><b>['.$$anonhash{$key}.']</b></font> '.
$screenname;
}
@@ -896,16 +906,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 (($ENV{'user.domain'} eq $contrib{$idx.':senderdomain'}) && ($ENV{'user.name'} eq $contrib{$idx.':sendername'})) {
+ 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>';
}
}
@@ -914,23 +924,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>';
@@ -938,6 +948,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'})) {
@@ -960,12 +972,12 @@ sub build_posting_display {
}
if (&discussion_open($status) &&
&Apache::lonnet::allowed('pch',
- $ENV{'request.course.id'}.
- ($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:''))) {
+ $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>';
}
@@ -983,7 +995,7 @@ sub build_posting_display {
}
if ($outputtarget eq 'export' || $message) {
my $thisindex=$idx;
- if ( (($ENV{'environment.threadeddiscussion'}) && ($sortposts eq '')) || ($sortposts eq 'thread') || ($outputtarget eq 'export')) {
+ if ( (($env{'environment.threadeddiscussion'}) && ($sortposts eq '')) || ($sortposts eq 'thread') || ($outputtarget eq 'export')) {
$thisindex=$origindex.substr('00'.$$replies[$$depth[$idx]],-2,2);
}
$$alldiscussion{$thisindex}=$idx;
@@ -1024,7 +1036,7 @@ sub build_posting_display {
my $uname = $contrib{$idx.':sendername'};
my $udom = $contrib{$idx.':senderdomain'};
my $poster = $uname.':'.$udom;
- if (defined($ENV{'form.totposters'})) {
+ if (defined($env{'form.totposters'})) {
if ($totposters == 0) {
$$shown{$idx} = 0;
} elsif ($totposters > 0) {
@@ -1079,7 +1091,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/:/) {
@@ -1169,11 +1181,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'},
@@ -1185,11 +1197,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);
@@ -1210,7 +1218,7 @@ sub get_post_contents {
my ($timesent,$attachmsg);
my %currattach = ();
$timesent = &Apache::lonlocal::locallocaltime($postversions[$i]);
- $$messages{$i}=~s/\n/\<br \/\>/g;
+ &newline_to_br(\$messages->{$i});
$$messages{$i}=&Apache::lontexconvert::msgtexconverted($$messages{$i});
$$subjects{$i}=~s/\n/\<br \/\>/g;
$$subjects{$i}=&Apache::lontexconvert::msgtexconverted($$subjects{$i});
@@ -1292,8 +1300,8 @@ 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']);
+ if (exists($env{'form.origpage'})) {
+ &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();"');
@@ -1326,11 +1334,11 @@ sub mail_screen {
}
END
my $anonscript;
- if (exists($ENV{'form.origpage'})) {
+ if (exists($env{'form.origpage'})) {
$anonscript = (<<END);
function setposttype() {
- var anondisc = $ENV{'form.anondiscuss'};
- var disc = $ENV{'form.discuss'};
+ var anondisc = $env{'form.anondiscuss'};
+ var disc = $env{'form.discuss'};
if (anondisc == 1) {
document.mailform.anondiscuss.checked = true
}
@@ -1347,15 +1355,15 @@ END
}
END
}
- if (($ENV{'form.replydisc'}) || ($ENV{'form.editdisc'})) {
- if ($ENV{'form.replydisc'}) {
- ($symb,$idx)=split(/\:\:\:/,$ENV{'form.replydisc'});
+ if (($env{'form.replydisc'}) || ($env{'form.editdisc'})) {
+ if ($env{'form.replydisc'}) {
+ ($symb,$idx)=split(/\:\:\:/,$env{'form.replydisc'});
} else {
- ($symb,$idx)=split(/\:\:\:/,$ENV{'form.editdisc'});
+ ($symb,$idx)=split(/\:\:\:/,$env{'form.editdisc'});
}
- 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'});
unless (($contrib{'hidden'}=~/\.$idx\./) || ($contrib{'deleted'}=~/\.$idx\./)) {
if ($contrib{$idx.':history'}) {
if ($contrib{$idx.':history'} =~ /:/) {
@@ -1365,7 +1373,7 @@ END
$numoldver = 1;
}
}
- if ($ENV{'form.replydisc'}) {
+ if ($env{'form.replydisc'}) {
if ($contrib{$idx.':history'}) {
if ($contrib{$idx.':history'} =~ /:/) {
my @oldversions = split/:/,$contrib{$idx.':history'};
@@ -1380,7 +1388,7 @@ END
&get_post_versions(\%msgversions,$contrib{$idx.':message'},0,$numoldver);
$message = $msgversions{$numoldver};
}
- $message=~s/\n/\<br \/\>/g;
+ &newline_to_br(\$message);
$quote='<blockquote>'.&Apache::lontexconvert::msgtexconverted($message).'</blockquote>';
if ($idx > 0) {
my %subversions = ();
@@ -1401,7 +1409,7 @@ END
if (defined($contrib{$idx.':replyto'})) {
$parentmsg = $contrib{$idx.':replyto'};
}
- unless (exists($ENV{'form.origpage'})) {
+ unless (exists($env{'form.origpage'})) {
my $anonflag = 0;
if ($contrib{$idx.':anonymous'}) {
$anonflag = 1;
@@ -1423,25 +1431,23 @@ END
}
}
}
- if ($ENV{'form.previous'}) {
- $prevtag = '<input type="hidden" name="previous" value="'.$ENV{'form.previous'}.'" />';
+ 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'});
+ 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
<head>
-$encoding
<title>The LearningOnline Network with CAPA</title>
<meta http-equiv="pragma" content="no-cache"></meta>
$htmlheader
@@ -1479,6 +1485,11 @@ $htmlheader
rec=1;
}
}
+ if (typeof(document.mailform.elements.blog)!="undefined") {
+ if (document.mailform.elements.blog.checked) {
+ rec=1;
+ }
+ }
if (rec) {
if (typeof(document.mailform.onsubmit)=='function') {
@@ -1501,13 +1512,13 @@ enctype="multipart/form-data">
$prevtag
<input type="hidden" name="postdata" value="$feedurl" />
END
- if ($ENV{'form.replydisc'}) {
+ if ($env{'form.replydisc'}) {
$r->print(<<END);
-<input type="hidden" name="replydisc" value="$ENV{'form.replydisc'}" />
+<input type="hidden" name="replydisc" value="$env{'form.replydisc'}" />
END
- } elsif ($ENV{'form.editdisc'}) {
+ } elsif ($env{'form.editdisc'}) {
$r->print(<<END);
-<input type="hidden" name="editdisc" value ="$ENV{'form.editdisc'}" />
+<input type="hidden" name="editdisc" value ="$env{'form.editdisc'}" />
<input type="hidden" name="parentmsg" value ="$parentmsg" />
END
}
@@ -1524,8 +1535,8 @@ Title: <input type="text" name="subject"
</textarea></p>
<p>
END
- if ( ($ENV{'form.editdisc'}) || ($ENV{'form.replydisc'}) ) {
- if ($ENV{'form.origpage'}) {
+ if ( ($env{'form.editdisc'}) || ($env{'form.replydisc'}) ) {
+ if ($env{'form.origpage'}) {
foreach (@currnewattach) {
$r->print('<input type="hidden" name="currnewattach" value="'.$_.'" />'."\n");
}
@@ -1533,7 +1544,7 @@ END
$r->print('<input type="hidden" name="deloldattach" value="'.$_.'" />'."\n");
}
}
- if ($ENV{'form.editdisc'}) {
+ if ($env{'form.editdisc'}) {
if ($attachmenturls) {
&extract_attachments($attachmenturls,$idx,$numoldver,\$attachmsg,\%attachments,\%currattach,\@currdelold);
$attachnum = scalar(keys %currattach);
@@ -1555,11 +1566,11 @@ END
</p>
</form>
END
- if ($ENV{'form.editdisc'} || $ENV{'form.replydisc'}) {
+ if ($env{'form.editdisc'} || $env{'form.replydisc'}) {
my $now = time;
my $ressymb = $symb;
my $postidx = '';
- if ($ENV{'form.editdisc'}) {
+ if ($env{'form.editdisc'}) {
$postidx = $idx;
}
if (@currnewattach > 0) {
@@ -1601,7 +1612,7 @@ sub print_display_options {
my $function = &Apache::loncommon::get_users_function();
my $tabcolor = &Apache::loncommon::designparm($function.'.tabbg',
- $ENV{'user.domain'});
+ $env{'user.domain'});
my $bodytag=&Apache::loncommon::bodytag('Discussion options',
'','');
@@ -1665,11 +1676,9 @@ sub print_display_options {
$disctogg = 'toggon';
}
my $html=&Apache::lonxml::xmlbegin();
- my $encoding=&Apache::lonxml::fontsettings();
$r->print(<<END);
$html
<head>
-$encoding
<title>$lt{'dido'}</title>
<meta http-equiv="pragma" content="no-cache" />
<script>
@@ -1810,10 +1819,10 @@ sub print_sortfilter_options {
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);
+ $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'});
+ 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);
@@ -1828,7 +1837,7 @@ sub print_sortfilter_options {
my $function = &Apache::loncommon::get_users_function();
my $tabcolor = &Apache::loncommon::designparm($function.'.tabbg',
- $ENV{'user.domain'});
+ $env{'user.domain'});
my $bodytag=&Apache::loncommon::bodytag('Discussion options',
'','');
my %lt = &Apache::lonlocal::texthash(
@@ -1850,11 +1859,9 @@ sub print_sortfilter_options {
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
<head>
-$encoding
<title>$lt{'diso'}</title>
<meta http-equiv="pragma" content="no-cache" />
<script type="text/javascript">
@@ -1956,16 +1963,19 @@ END
sub print_showposters {
my ($r,$symb,$previous,$feedurl,$sortposts) = @_;
+ &Apache::loncommon::content_type($r,'text/html');
+ $r->send_http_header;
+
&Apache::lonenc::check_encrypt(\$symb);
- my $crs='/'.$ENV{'request.course.id'};
- if ($ENV{'request.course.sec'}) {
- $crs.='_'.$ENV{'request.course.sec'};
+ 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($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 %namesort = ();
my %postcounts = ();
my %lt=&Apache::lonlocal::texthash(
@@ -2005,11 +2015,9 @@ sub print_showposters {
}
}
my $html=&Apache::lonxml::xmlbegin();
- my $encoding=&Apache::lonxml::fontsettings();
$r->print(<<END);
$html
<head>
-$encoding
<title>$lt{'diso'}</title>
<meta http-equiv="pragma" content="no-cache" />
</head>
@@ -2121,11 +2129,9 @@ sub fail_redirect {
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>
-$encoding
<title>Feedback not sent</title>
<meta http-equiv="pragma" content="no-cache" />
<meta HTTP-EQUIV="Refresh" CONTENT="2; url=$feedurl" />
@@ -2140,7 +2146,7 @@ ENDFAILREDIR
}
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 = '';
@@ -2211,19 +2217,18 @@ sub redirect_back {
$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
<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(); }'>
+<body bgcolor="#FFFFFF" onLoad='if (window.name!="loncapaclient") { this.document.reldt.submit(); self.window.close(); }'>
<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
@@ -2244,11 +2249,9 @@ sub no_redirect_back {
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>
-$encoding
<title>Feedback not sent</title>
<meta http-equiv="pragma" content="no-cache" />
ENDNOREDIR
@@ -2261,7 +2264,7 @@ ENDNOREDIR
my $logo=&Apache::loncommon::lonhttpdurl('/adm/lonIcons/lonlogos.gif');
$r->print (<<ENDNOREDIRTWO);
</head>
-<body bgcolor="#FFFFFF" onLoad='if (window.name!="loncapaclient") { self.close(); }'>
+<body bgcolor="#FFFFFF" onLoad='if (window.name!="loncapaclient") { self.window.close(); }'>
<img align="right" src="$logo" />
<b>$nofeed</b>
<br /><a href="$feedurl">$continue</a>
@@ -2274,8 +2277,8 @@ sub screen_header {
my ($feedurl,$symb) = @_;
my $msgoptions='';
my $discussoptions='';
- unless (($ENV{'form.replydisc'}) || ($ENV{'form.editdisc'})) {
- if (($feedurl=~/^\/res\//) && ($feedurl!~/^\/res\/adm/)) {
+ unless (($env{'form.replydisc'}) || ($env{'form.editdisc'})) {
+ if (($feedurl=~/^\/res\//) && ($feedurl!~/^\/res\/adm/) && ($env{'user.adv'})) {
$msgoptions=
'<p><label><input type="checkbox" name="author" /> '.
&mt('Feedback to resource author').'</label></p>';
@@ -2298,18 +2301,21 @@ sub screen_header {
'</label></p>';
}
}
- if ($ENV{'request.course.id'}) {
+ if ($env{'request.course.id'}) {
if (&discussion_open(undef,$symb) &&
&Apache::lonnet::allowed('pch',
- $ENV{'request.course.id'}.
- ($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:''))) {
+ $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"':'').' /> '.
+ ($env{'form.replydisc'}?' checked="1"':'').' /> '.
&mt('Contribution to course discussion of resource');
$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></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) {
@@ -2336,15 +2342,15 @@ sub clear_out_html {
# 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) ||
+ 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>
%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,
+ M=>1, ALGEBRA=>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
@@ -2380,7 +2386,7 @@ sub secapply {
my ($adr,$sections)=($rec=~/^([^\(]+)\(([^\)]+)\)/);
if ($sections) {
foreach (split(/\;/,$sections)) {
- if (($_ eq $ENV{'request.course.sec'}) ||
+ if (($_ eq $env{'request.course.sec'}) ||
($defaultflag && ($_ eq '*'))) {
return $adr;
}
@@ -2391,37 +2397,68 @@ sub secapply {
return '';
}
+=pod
+
+=over 4
+
+=item *
+
+decide_receiver($feedurl,$author,$question,$course,$policy,$defaultflag);
+
+Arguments
+ $feedurl - /res/ url of resource (only need if $author is true)
+ $author,$question,$course,$policy - all true/false parameters
+ if true will attempt to find the addresses of user that should receive
+ this type of feedback (author - feedback to author of resource $feedurl,
+ $question 'Resource Content Questions', $course 'Course Content Question',
+ $policy 'Course Policy')
+ (Additionally it also checks $env for whether the corresponding form.<name>
+ element exists, for ease of use in a html response context)
+
+ $defaultflag - (internal should be left blank) if true gather addresses
+ that aren't for a section even if I have a section
+ (used for reccursion internally, first we look for
+ addresses for our specific section then we recurse
+ and look for non section addresses)
+
+Returns
+ $typestyle - string of html text, describing what addresses were found
+ %to - a hash, which keys are addresses of users to send messages to
+ the keys will look like name:domain
+
+=cut
+
sub decide_receiver {
my ($feedurl,$author,$question,$course,$policy,$defaultflag) = @_;
my $typestyle='';
my %to=();
- if ($ENV{'form.author'}||$author) {
- $typestyle.='Submitting as Author Feedback<br>';
+ if ($env{'form.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.question'}||$question) {
+ $typestyle.='Submitting as Question<br />';
foreach (split(/\,/,
- $ENV{'course.'.$ENV{'request.course.id'}.'.question.email'})
+ $env{'course.'.$env{'request.course.id'}.'.question.email'})
) {
my $rec=&secapply($_,$defaultflag);
if ($rec) { $to{$rec}=1; }
}
}
- if ($ENV{'form.course'}||$course) {
+ if ($env{'form.course'}||$course) {
$typestyle.='Submitting as Comment<br />';
foreach (split(/\,/,
- $ENV{'course.'.$ENV{'request.course.id'}.'.comment.email'})
+ $env{'course.'.$env{'request.course.id'}.'.comment.email'})
) {
my $rec=&secapply($_,$defaultflag);
if ($rec) { $to{$rec}=1; }
}
}
- if ($ENV{'form.policy'}||$policy) {
+ if ($env{'form.policy'}||$policy) {
$typestyle.='Submitting as Policy Feedback<br />';
foreach (split(/\,/,
- $ENV{'course.'.$ENV{'request.course.id'}.'.policy.email'})
+ $env{'course.'.$env{'request.course.id'}.'.policy.email'})
) {
my $rec=&secapply($_,$defaultflag);
if ($rec) { $to{$rec}=1; }
@@ -2441,14 +2478,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 {
@@ -2481,40 +2520,40 @@ sub adddiscuss {
$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'}:''))) {
+ &Apache::lonnet::allowed('pch',$env{'request.course.id'}.
+ ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''))) {
my %contrib=('message' => $email,
- 'sendername' => $ENV{'user.name'},
- 'senderdomain' => $ENV{'user.domain'},
- 'screenname' => $ENV{'environment.screenname'},
- 'plainname' => $ENV{'environment.firstname'}.' '.
- $ENV{'environment.middlename'}.' '.
- $ENV{'environment.lastname'}.' '.
- $ENV{'enrironment.generation'},
+ 'sendername' => $env{'user.name'},
+ 'senderdomain' => $env{'user.domain'},
+ 'screenname' => $env{'environment.screenname'},
+ 'plainname' => $env{'environment.firstname'}.' '.
+ $env{'environment.middlename'}.' '.
+ $env{'environment.lastname'}.' '.
+ $env{'enrironment.generation'},
'attachmenturl'=> $attachmenturl,
'subject' => $subject);
- if ($ENV{'form.replydisc'}) {
- $contrib{'replyto'}=(split(/\:\:\:/,$ENV{'form.replydisc'}))[1];
+ if ($env{'form.replydisc'}) {
+ $contrib{'replyto'}=(split(/\:\:\:/,$env{'form.replydisc'}))[1];
}
if ($anon) {
$contrib{'anonymous'}='true';
}
if (($symb) && ($email)) {
- if ($ENV{'form.editdisc'}) {
+ if ($env{'form.editdisc'}) {
my %newcontrib = ();
$contrib{'ip'}=$ENV{'REMOTE_ADDR'};
$contrib{'host'}=$Apache::lonnet::perlvar{'lonHostID'};
$contrib{'timestamp'} = time;
$contrib{'history'} = '';
my $numoldver = 0;
- my ($oldsymb,$oldidx)=split(/\:\:\:/,$ENV{'form.editdisc'});
+ 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'},
- $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+ my %oldcontrib=&Apache::lonnet::restore($oldsymb,$env{'request.course.id'},
+ $env{'course.'.$env{'request.course.id'}.'.domain'},
+ $env{'course.'.$env{'request.course.id'}.'.num'});
if (defined($oldcontrib{$oldidx.':replyto'})) {
$contrib{'replyto'} = $oldcontrib{$oldidx.':replyto'};
}
@@ -2549,22 +2588,22 @@ sub adddiscuss {
my $key = $oldidx.':'.&Apache::lonnet::escape($oldsymb).':'.$_;
$newcontrib{$key} = $contrib{$_};
}
- my $put_reply = &Apache::lonnet::putstore($ENV{'request.course.id'},
- \%newcontrib,
- $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
- $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+ my $put_reply = &Apache::lonnet::putstore($env{'request.course.id'},
+ $oldsymb,$oldidx,\%contrib,
+ $env{'course.'.$env{'request.course.id'}.'.domain'},
+ $env{'course.'.$env{'request.course.id'}.'.num'});
$status='Editing class discussion'.($anon?' (anonymous)':'');
} else {
$status='Adding to class discussion'.($anon?' (anonymous)':'').': '.
- &Apache::lonnet::store(\%contrib,$symb,$ENV{'request.course.id'},
- $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
- $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+ &Apache::lonnet::store(\%contrib,$symb,$env{'request.course.id'},
+ $env{'course.'.$env{'request.course.id'}.'.domain'},
+ $env{'course.'.$env{'request.course.id'}.'.num'});
}
my %storenewentry=($symb => time);
$status.='<br />'.&mt('Updating discussion time').': '.
&Apache::lonnet::put('discussiontimes',\%storenewentry,
- $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
- $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+ $env{'course.'.$env{'request.course.id'}.'.domain'},
+ $env{'course.'.$env{'request.course.id'}.'.num'});
}
my %record=&Apache::lonnet::restore('_discussion');
my ($temp)=keys %record;
@@ -2587,38 +2626,65 @@ 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;
+ 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'});
$subject=~s/\n/\<br \/\>/g;
$subject=&Apache::lontexconvert::msgtexconverted($subject);
- $r->print('<table border="2"><tr><td>'.
- '<b>Subject:</b> '.$subject.'<br /><br />'.
- $message.'</td></tr></table>');
+ my $html=&Apache::lonxml::xmlbegin();
+ $r->print($html.'<head>'.
+ '</head><body><table border="2"><tr><td>'.
+ '<b>Subject:</b> '.$subject.'<br /><br />'.
+ $message.'</td></tr></table></body></html>');
+}
+
+
+sub newline_to_br {
+ my ($message)=@_;
+ my $newmessage;
+ my $parser=HTML::LCParser->new($message);
+ while (my $token=$parser->get_token()) {
+ if ($token->[0] eq 'T') {
+ my $text=$token->[1];
+ $text=~s/\n/\<br \/\>/g;
+ $newmessage.=$text;
+ } elsif ($token->[0] eq 'D' || $token->[0] eq 'C') {
+ $newmessage.=$token->[1];
+ } elsif ($token->[0] eq 'PI' || $token->[0] eq 'E') {
+ $newmessage.=$token->[2];
+ } elsif ($token->[0] eq 'S') {
+ $newmessage.=$token->[4];
+ }
+
+ }
+ $$message=$newmessage;
}
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);
<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 $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 $timestamp=$env{'form.timestamp'};
+ my $numoldver=$env{'form.numoldver'};
my $bodytag=&Apache::loncommon::bodytag('Discussion Post Attachments',
'','');
my $msg = '';
@@ -2629,11 +2695,9 @@ sub modify_attachments {
}
&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 () {
@@ -2676,14 +2740,15 @@ END
</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'}" />
+<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="blog" value="$env{'form.blog'}" />
+<input type="hidden" name="discuss" value="$env{'form.discuss'}" />
END
foreach (@{$currnewattach}) {
$r->print('<input type="hidden" name="currnewattach" value="'.$_.'" />'."\n");
@@ -2702,28 +2767,15 @@ END
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 = ();
+
+ @{$currnewattach}=
+ &Apache::loncommon::get_env_multiple('form.currnewattach');
+ @{$currdelold}=
+ &Apache::loncommon::get_env_multiple('form.deloldattach');
+ if (exists($env{'form.delnewattach'})) {
+ my @currdelnew =
+ &Apache::loncommon::get_env_multiple('form.delnewattach');
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) {
@@ -2738,13 +2790,7 @@ sub process_attachments {
}
@{$currnewattach} = @currnew;
}
- if (exists($ENV{'form.keepold'})) {
- if (ref($ENV{'form.keepold'}) eq 'ARRAY') {
- @{$keepold} = @{$ENV{'form.keepold'}};
- } else {
- $$keepold[0] = $ENV{'form.keepold'};
- }
- }
+ @{$keepold} = &Apache::loncommon::get_env_multiple('form.keepold');
}
sub generate_attachments_button {
@@ -2766,8 +2812,9 @@ 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="discuss" value = "0";
+<input type="hidden" name="blog" value = "0" />
+<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)) {
@@ -2844,10 +2891,10 @@ sub construct_attachmenturl {
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'});
+ 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'} =~ /:/) {
@@ -2901,12 +2948,7 @@ sub has_discussion {
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();
- }
+ my $ressymb = $resource->wrap_symb();
push @{$resourcesref}, $ressymb;
}
}
@@ -2952,13 +2994,21 @@ sub handler {
&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']);
-
- if ($ENV{'form.discsymb'}) {
- my ($symb,$feedurl) = &get_feedurl_and_clean_symb($ENV{'form.discsymb'});
+ 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';
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) {
+ 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\.//;
@@ -2972,35 +3022,33 @@ sub handler {
}
}
if ($chgcount > 0) {
- &Apache::lonnet::put('nohist_'.$ENV{'request.course.id'}.'_discuss',
- \%readinghash,$ENV{'user.domain'},$ENV{'user.name'});
+ &Apache::lonnet::put('nohist_'.$env{'request.course.id'}.'_discuss',
+ \%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'}) {
+ if ($env{'form.allversions'}) {
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
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'};
+ my $crs='/'.$env{'request.course.id'};
+ if ($env{'request.course.sec'}) {
+ $crs.='_'.$env{'request.course.sec'};
}
$crs=~s|_|/|g;
my $seeid=&Apache::lonnet::allowed('rin',$crs);
- my ($symb,$idx)=split(/\:\:\:/,$ENV{'form.allversions'});
+ my ($symb,$idx)=split(/\:\:\:/,$env{'form.allversions'});
($symb)=&get_feedurl_and_clean_symb($symb);
if ($idx > 0) {
my %messages = ();
@@ -3009,79 +3057,73 @@ END
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'});
+ 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'});
+ 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'}) {
+ 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 ($symb,$feedurl)=&get_feedurl_and_clean_symb($env{'form.userpick'});
my $numpicks = @posters;
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'},'','','',
+ &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'}) {
- 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'});
+ 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','',
+ '',$env{'form.previous'},$env{'form.sortposts'},
+ $env{'form.rolefilter'},$env{'form.statusfilter'},
+ $env{'form.sectionpick'});
return OK;
- } 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);
+ } 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.navtime'}) {
+ } elsif ($env{'form.navtime'}) {
my %discinfo = ();
my @resources = ();
- if (defined($ENV{'form.navmaps'})) {
- 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'}");
+ @resources = ("$env{'form.navmaps'}");
}
} else {
&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.',
'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} = $ENV{'form.navtime'};
+ $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'});
+ &Apache::lonnet::put('nohist_'.$env{'request.course.id'}.'_discuss',
+ \%discinfo,$env{'user.domain'},$env{'user.name'});
} else {
$textline = "<b>$lt{'twnp'}</b>";
}
@@ -3089,16 +3131,14 @@ END
$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
<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(); }'>
+<body bgcolor="#FFFFFF" onLoad='if (window.name!="loncapaclient") { this.document.reldt.submit(); self.window.close(); }'>
<img align="right" src="$logo" />
$textline
<form name="reldt" action="$feedurl" target="loncapaclient">
@@ -3108,70 +3148,75 @@ $textline
</html>
ENDREDIR
return OK;
- } elsif ($ENV{'form.modifydisp'}) {
- my ($symb,$feedurl)=&get_feedurl_and_clean_symb($ENV{'form.modifydisp'});
+ } elsif ($env{'form.modifydisp'}) {
+ 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,
+ 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'} ||
- $ENV{'form.onlyunmark'} || $ENV{'form.toggoff'} ||
- $ENV{'form.toggon'} || $ENV{'form.markread'}) {
- my ($symb,$feedurl)=&get_feedurl_and_clean_symb($ENV{'form.symb'});
+ } 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; }
+ 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'}) {
+ 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'};
+ if ($env{'form.markonread'}) {
+ if ( $env{'form.previous'} > 0 ) {
+ $discinfo{$symb.'_lastread'} = $env{'form.previous'};
}
$discinfo{$symb.'_markondisp'} = 0;
}
# --------------------------------- Modify display setting for this discussion
- if ($ENV{'form.allposts'}) {
+ 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; }
+ 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; }
+ 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);
+ '0','0','','',$previous);
return OK;
- } elsif (($ENV{'form.hide'}) || ($ENV{'form.unhide'})) {
+ } elsif (($env{'form.hide'}) || ($env{'form.unhide'})) {
# ----------------------------------------------------------------- Hide/unhide
- my $entry=$ENV{'form.hide'}?$ENV{'form.hide'}:$ENV{'form.unhide'};
+ 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 $currenthidden=$contrib{'hidden'};
- my $currentstudenthidden=$contrib{'studenthidden'};
-
- my $crs='/'.$ENV{'request.course.id'};
- if ($ENV{'request.course.sec'}) {
- $crs.='_'.$ENV{'request.course.sec'};
+ 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'}) {
+ 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'});
+
+ my $currenthidden=$contrib{'hidden'};
+ my $currentstudenthidden=$contrib{'studenthidden'};
+
+ if ($env{'form.hide'}) {
$currenthidden.='.'.$idx.'.';
unless ($seeid) {
$currentstudenthidden.='.'.$idx.'.';
@@ -3180,20 +3225,20 @@ ENDREDIR
$currenthidden=~s/\.$idx\.//g;
}
my %newhash=('hidden' => $currenthidden);
- if ( ($ENV{'form.hide'}) && (!$seeid) ) {
+ 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,$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'});
- if ($ENV{'form.cmd'} eq 'threadedon') {
+ } 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 {
@@ -3201,60 +3246,60 @@ 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'}) {
+ } elsif ($env{'form.deldisc'}) {
# --------------------------------------------------------------- Hide for good
- my ($symb,$idx)=split(/\:\:\:/,$ENV{'form.deldisc'});
+ 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 %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'});
+ &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'});
+ '0','0','','',$env{'form.previous'});
return OK;
- } elsif ($ENV{'form.preview'}) {
+ } elsif ($env{'form.preview'}) {
# -------------------------------------------------------- User wants a preview
&show_preview($r);
return OK;
- } elsif ($ENV{'form.attach'}) {
+ } 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']);
+ &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['subject','comment','addnewattach','delnewattach','timestamp','numoldver','idx','anondiscuss','discuss','blog']);
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'};
+ 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'};
+ 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'});
+ 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'}) {
+ } 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 ($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)$/) {
+ my $previous=$env{'form.previous'};
+ if ($feedurl =~ /\.(problem|exam|quiz|assess|survey|form|library|task)$/) {
$mode='problem';
$status=$Apache::inputtags::status[-1];
}
@@ -3264,28 +3309,28 @@ ENDREDIR
return OK;
} else {
# ------------------------------------------------------------- Normal feedback
- my $feedurl=$ENV{'form.postdata'};
+ 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];
+ 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];
+ } 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'}) {
+ } elsif ($env{'form.origpage'}) {
$symb="";
} else {
$symb=&Apache::lonnet::symbread($feedurl);
}
unless ($symb) {
- $symb=$ENV{'form.symb'};
+ $symb=$env{'form.symb'};
if ($symb) {
my ($map,$id,$url)=&Apache::lonnet::decode_symb($symb);
$feedurl=&Apache::lonnet::clutter($url);
@@ -3293,13 +3338,11 @@ ENDREDIR
}
&Apache::lonenc::check_decrypt(\$symb);
my $goahead=1;
- if ($feedurl=~/\.(problem|exam|quiz|assess|survey|form)$/) {
+ if ($feedurl=~/\.(problem|exam|quiz|assess|survey|form|task)$/) {
unless ($symb) { $goahead=0; }
}
# backward compatibility (bulletin boards used to be 'wrapped')
- if ($feedurl=~m|^/adm/wrapper/adm/.*/bulletinboard$|) {
- $feedurl=~s|^/adm/wrapper||;
- }
+ &dewrapper(\$feedurl);
if (!$goahead) {
# Ambiguous Problem Resource
$r->internal_redirect('/adm/ambiguous');
@@ -3311,17 +3354,18 @@ ENDREDIR
($feedurl=~m:^/res:) && ($feedurl!~m:^/res/adm:)
)
||
- ($ENV{'request.course.id'} && ($feedurl!~m:^/adm:))
+ ($env{'request.course.id'} && ($feedurl!~m:^/adm:))
||
- ($ENV{'request.course.id'} && ($symb=~/^bulletin\_\_\_/))
+ ($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);
+ return OK;
}
# --------------------------------------------------- Print login screen header
- unless ($ENV{'form.sendit'}) {
+ unless ($env{'form.sendit'}) {
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
my $options=&screen_header($feedurl,$symb);
@@ -3335,8 +3379,8 @@ ENDREDIR
# 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);
@@ -3344,20 +3388,20 @@ 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.origpage'}) || ($ENV{'form.editdisc'}) ||
- ($ENV{'form.replydisc'})) {
+ 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'};
+ 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 = ();
@@ -3366,13 +3410,13 @@ ENDREDIR
&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) {
+ } elsif ($env{'form.attachment.filename'}) {
+ unless (length($env{'form.attachment'})>131072) {
$attachmenturl=&Apache::lonnet::userfileupload('attachment',undef,'feedback');
}
}
# Filter HTML out of message (could be nasty)
- my $message=&clear_out_html($ENV{'form.comment'});
+ my $message=&clear_out_html($env{'form.comment'});
# Assemble email
my ($email,$citations)=&assemble_email($feedurl,$message,$prevattempts,
@@ -3382,22 +3426,34 @@ 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'}),$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'} || $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++;
}
+
+# Add to blog?
+
+ my $blog='';
+ if ($env{'form.blog'}) {
+ my $subject = &clear_out_html($env{'form.subject'});
+ $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;
}
@@ -3436,5 +3492,39 @@ 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.'.$env{'request.course.id'}.
+ '.allow_discussion_post_editing'};
+ if ($allow_editing_config =~ m/^\s*yes\s*$/i) {
+ $can_edit = 1;
+ } else {
+ my @editor_roles = split(/,/,$allow_editing_config);
+ if (@editor_roles > 0) {
+ foreach my $editor (@editor_roles) {
+ my ($editor_role,$editor_sec) = split(/:/,$editor);
+ if ($editor_role eq $role) {
+ if (defined($editor_sec)) {
+ if (defined($section)) {
+ if ($editor_sec eq $section) {
+ $can_edit = 1;
+ last;
+ }
+ }
+ } else {
+ $can_edit = 1;
+ last;
+ }
+ }
+ }
+ }
+ }
+ return $can_edit;
+}
+
1;
__END__