--- loncom/interface/lonfeedback.pm 2006/04/13 18:59:02 1.191
+++ loncom/interface/lonfeedback.pm 2007/02/27 20:35:22 1.243
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Feedback
#
-# $Id: lonfeedback.pm,v 1.191 2006/04/13 18:59:02 albertel Exp $
+# $Id: lonfeedback.pm,v 1.243 2007/02/27 20:35:22 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -42,7 +42,9 @@ use Apache::lonenc();
use Apache::lonrss();
use HTML::LCParser();
use Apache::lonspeller();
+use Apache::longroup;
use Cwd;
+use LONCAPA;
sub discussion_open {
my ($status,$symb)=@_;
@@ -71,7 +73,10 @@ sub discussion_visible {
}
sub list_discussion {
- my ($mode,$status,$ressymb,$imsextras)=@_;
+ my ($mode,$status,$ressymb,$imsextras,$group)=@_;
+ unless ($ressymb) { $ressymb=&Apache::lonnet::symbread(); }
+ unless ($ressymb) { return ''; }
+ $ressymb=&wrap_symb($ressymb);
my $outputtarget=$env{'form.grade_target'};
if (defined($env{'form.export'})) {
if($env{'form.export'}) {
@@ -83,7 +88,28 @@ sub list_discussion {
$outputtarget = 'export';
}
}
- if (not &discussion_visible($status)) { return ''; }
+ if (not &discussion_visible($status)) {
+ if ($mode ne 'board') {
+ &Apache::lonenc::check_encrypt(\$ressymb);
+ return &send_message_link($ressymb);
+ }
+ }
+ if ($group ne '' && $mode eq 'board') {
+ if (&check_group_priv($group,'vgb') ne 'ok') {
+ return '';
+ }
+ }
+
+ my ($blocked,$blocktext) =
+ &Apache::loncommon::blocking_status('boards');
+ if ($blocked) {
+ &Apache::lonenc::check_encrypt(\$ressymb);
+ if ($mode ne 'board') {
+ $blocktext.='<br />'.&send_message_link($ressymb);
+ }
+ return $blocktext;
+ }
+
my @bgcols = ("#cccccc","#eeeeee");
my $discussiononly=0;
if ($mode eq 'board') { $discussiononly=1; }
@@ -94,9 +120,6 @@ sub list_discussion {
$crs.='_'.$env{'request.course.sec'};
}
$crs=~s/\_/\//g;
- unless ($ressymb) { $ressymb=&Apache::lonnet::symbread(); }
- unless ($ressymb) { return ''; }
- $ressymb=&wrap_symb($ressymb);
my $encsymb=&Apache::lonenc::check_encrypt($ressymb);
my $viewgrades=(&Apache::lonnet::allowed('vgr',$crs)
&& ($ressymb=~/\.(problem|exam|quiz|assess|survey|form|task)$/));
@@ -124,24 +147,16 @@ sub list_discussion {
my $previous = 0;
my $visit = 0;
my $newpostsflag = 0;
- my @posters = split/\&/,$dischash{$userpickkey};
+ my @posters = split(/\&/,$dischash{$userpickkey});
# 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']);
+ &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['previous','sortposts','rolefilter','statusfilter','sectionpick','grouppick','totposters']);
my $sortposts = $env{'form.sortposts'};
my $statusfilter = $env{'form.statusfilter'};
- my @sectionpick = ();
- if ($env{'form.sectionpick'} =~ /,/) {
- @sectionpick = split/,/,$env{'form.sectionpick'};
- } else {
- $sectionpick[0] = $env{'form.sectionpick'};
- }
- my @rolefilter = ();
- if ($env{'form.rolefilter'} =~ /,/) {
- @rolefilter = split/,/,$env{'form.rolefilter'};
- } else {
- $rolefilter[0] = $env{'form.rolefilter'};
- }
+ my @sectionpick = split(/,/,$env{'form.sectionpick'});
+ my @grouppick = split(/,/,$env{'form.grouppick'});
+ my @rolefilter = split(/,/,$env{'form.rolefilter'});
+
my $totposters = $env{'form.totposters'};
$previous = $env{'form.previous'};
if ($previous > 0) {
@@ -152,38 +167,42 @@ sub list_discussion {
}
}
+ my $cdom = $env{'course.'.$cid.'.domain'};
+ my $cnum = $env{'course.'.$cid.'.num'};
+
# Get information about students and non-students in course for filtering display of posts
my %roleshash = ();
my %roleinfo = ();
+ my ($classgroups,$studentgroups);
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/:/,$_;
+ %roleshash = &Apache::lonnet::dump('nohist_userroles',$cdom,$cnum);
+ foreach my $rolekey (keys(%roleshash)) {
+ my ($role,$uname,$udom,$sec) = split(/:/,$rolekey);
if ($role =~ /^cr/) {
$role = 'cr';
}
- my ($end,$start) = split/:/,$roleshash{$_};
+ my ($end,$start) = split(/:/,$roleshash{$rolekey});
my $now = time;
my $status = 'Active';
if (($now < $start) || ($end > 0 && $now > $end)) {
$status = 'Expired';
}
if ($uname && $udom) {
- push @{$roleinfo{$uname.':'.$udom}}, $role.':'.$sec.':'.$status;
+ push(@{$roleinfo{$uname.':'.$udom}}, $role.':'.$sec.':'.$status);
}
}
- my ($classlist) = &Apache::loncoursedata::get_classlist(
- $env{'course.'.$cid.'.domain'},
- $env{'course.'.$cid.'.num'});
+ my ($classlist,$keylist) =
+ &Apache::loncoursedata::get_classlist($cdom,$cnum);
my $sec_index = &Apache::loncoursedata::CL_SECTION();
my $status_index = &Apache::loncoursedata::CL_STATUS();
while (my ($student,$data) = each %$classlist) {
my ($section,$status) = ($data->[$sec_index],
$data->[$status_index]);
- push @{$roleinfo{$student}}, 'st:'.$section.':'.$status;
+ push(@{$roleinfo{$student}}, 'st:'.$section.':'.$status);
}
+ ($classgroups,$studentgroups) =
+ &Apache::loncoursedata::get_group_memberships($classlist,$keylist,
+ $cdom,$cnum);
}
# Get discussion display default settings for user
@@ -223,7 +242,15 @@ sub list_discussion {
}
$visit ++;
- my $seeid=&Apache::lonnet::allowed('rin',$crs);
+ my $seeid;
+ if (($group ne '') && ($mode eq 'board') &&
+ ($ressymb =~ m|^bulletin___\d+___adm/wrapper/adm/\Q$cdom\E/\Q$cnum\E/\d+/bulletinboard$|)) {
+ if (&check_group_priv($group,'dgp') eq 'ok') {
+ $seeid = 1;
+ }
+ } else {
+ $seeid=&Apache::lonnet::allowed('rin',$crs);
+ }
my @discussionitems=();
my %shown = ();
my @posteridentity=();
@@ -250,7 +277,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,\%anonhash,$anoncnt);
+ &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,\@grouppick,$classgroups,$statusfilter,$toggkey,$outputtarget,\%anonhash,$anoncnt,$group);
my $discussion='';
my $manifestfile;
@@ -278,6 +305,13 @@ sub list_discussion {
'disp' => 'Display',
'nolo' => 'Not new',
'togg' => 'Toggle read/unread',
+ 'aner' => 'An error occurred opening the manifest file.',
+ 'difo' => 'Discussion for',
+ 'aerr' => 'An error occurred opening the export file for posting',
+ 'aysu' => 'Are you sure you want to delete this post?',
+ 'dpwn' => 'Deleted posts will no longer be visible to you and other students',
+ 'bwco' => 'but will continue to be visible to your instructor',
+ 'depo' => 'Deleted posts will no longer be visible to you or anyone else.',
);
my $currdisp = $lt{'allposts'};
@@ -323,6 +357,7 @@ sub list_discussion {
if ($newpostsflag) {
$chglink .= '&previous='.$prevread;
}
+ $chglink.=&group_args($group);
if ($visible) {
# Print the discusssion
@@ -371,69 +406,40 @@ identifier="MANIFEST-$ressymb" xsi:schem
imscp_v1p1.xsd http://www.imsglobal.org/xsd/imsmd_v1p2 imsmd_v1p2p2.xsd">
<organizations default="$ressymb">
<organization identifier="$ressymb">
- <title>Discussion for $ressymb</title>\n|;
+ <title>$lt{'difo'} $ressymb</title>\n|;
} else {
- $discussion .= 'An error occurred opening the manifest file.<br />';
+ $discussion .= $lt{'aner'}.'<br />';
}
} else {
my $colspan=$maxdepth+1;
$discussion.= qq|
<script>
- function studentdelete (symb,idx,newflag,previous) {
+ function verifydelete (caller,symb,idx,newflag,previous,groupparm) {
var symbparm = symb+':::'+idx
var prevparm = ""
if (newflag == 1) {
prevparm = "&previous="+previous
}
- if (confirm("Are you sure you want to delete this post?\\nDeleted posts will no longer be visible to you and other students,\\nbut will continue to be visible to your instructor")) {
- document.location.href = "/adm/feedback?hide="+symbparm+prevparm
- }
+ if (caller == 'studentdelete') {
+ if (confirm("$lt{'aysu'}\\n$lt{'dpwn'},\\n$lt{'bwco'}")) {
+ document.location.href = "/adm/feedback?hide="+symbparm+prevparm+groupparm
+ }
+ } else {
+ if (caller == 'seeiddelete') {
+ if (confirm("$lt{'aysu'}\\n$lt{'depo'}")) {
+ document.location.href = "/adm/feedback?deldisc="+symbparm+prevparm+groupparm
+ }
+ }
+ }
}
</script>
|;
$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='.$escsymb;
- if ($newpostsflag) {
- $discussion .= '&previous='.$prevread;
- }
- $discussion .='">'.&mt('Threaded View').'</a> '.
- '<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='.$escsymb;
- if ($newpostsflag) {
- $discussion .= '&previous='.$prevread;
- }
- $discussion .='">'.&mt('Sorting/Filtering options').'</a>  ';
- } else {
- $discussion .= '<td align="left">';
- }
- $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/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>';
- }
- } else {
- $discussion .= '<td> </td>';
- }
- $discussion .= '</tr></table></td></tr>';
-
- my $numhidden = keys %notshown;
+ $discussion .= &action_links_bar($colspan,$ressymb,$visible,
+ $newpostsflag,$group,
+ $prevread,$markondisp);
+ my $escsymb=&escape($ressymb);
+ my $numhidden = keys(%notshown);
if ($numhidden > 0) {
my $colspan = $maxdepth+1;
$discussion.="\n".'<tr><td bgcolor="#CCCCCC" colspan="'.$colspan.'">'.
@@ -441,6 +447,7 @@ imscp_v1p1.xsd http://www.imsglobal.org/
if ($newpostsflag) {
$discussion .= '&previous='.$prevread;
}
+ $discussion .= &group_args($group);
$discussion .= '">'.&mt('Show all posts').'</a> '.&mt('to display').' '.
$numhidden.' ';
if ($showunmark) {
@@ -455,39 +462,39 @@ imscp_v1p1.xsd http://www.imsglobal.org/
# Choose sort mechanism
my @showposts = ();
if ($sortposts eq 'descdate') {
- @showposts = (sort { $b <=> $a } keys %alldiscussion);
+ @showposts = (sort { $b <=> $a } keys(%alldiscussion));
} elsif ($sortposts eq 'thread') {
- @showposts = (sort { $a <=> $b } keys %alldiscussion);
+ @showposts = (sort { $a <=> $b } keys(%alldiscussion));
} elsif ($sortposts eq 'subject') {
- foreach (sort keys %subjectsort) {
- push @showposts, @{$subjectsort{$_}};
+ foreach my $key (sort(keys(%subjectsort))) {
+ push(@showposts, @{$subjectsort{$key}});
}
} elsif ($sortposts eq 'username') {
- foreach my $domain (sort keys %usernamesort) {
- foreach (sort keys %{$usernamesort{$domain}}) {
- push @showposts, @{$usernamesort{$domain}{$_}};
+ foreach my $domain (sort(keys(%usernamesort))) {
+ foreach my $key (sort(keys(%{$usernamesort{$domain}}))) {
+ push(@showposts, @{$usernamesort{$domain}{$key}});
}
}
} elsif ($sortposts eq 'lastfirst') {
- foreach my $last (sort keys %namesort) {
- foreach (sort keys %{$namesort{$last}}) {
- push @showposts, @{$namesort{$last}{$_}};
+ foreach my $last (sort(keys(%namesort))) {
+ foreach my $key (sort(keys(%{$namesort{$last}}))) {
+ push(@showposts, @{$namesort{$last}{$key}});
}
}
} else {
- @showposts = (sort { $a <=> $b } keys %alldiscussion);
+ @showposts = (sort { $a <=> $b } keys(%alldiscussion));
}
my $currdepth = 0;
my $firstidx = $alldiscussion{$showposts[0]};
- foreach (@showposts) {
+ foreach my $post (@showposts) {
unless (($sortposts eq 'thread') || (($sortposts eq '') && ($env{'environment.threadeddiscussion'})) || ($outputtarget eq 'export')) {
- $alldiscussion{$_} = $_;
+ $alldiscussion{$post} = $post;
}
- unless ( ($notshown{$alldiscussion{$_}} eq '1') || ($shown{$alldiscussion{$_}} == 0) ) {
+ unless ( ($notshown{$alldiscussion{$post}} eq '1') || ($shown{$alldiscussion{$post}} == 0) ) {
if ($outputtarget ne 'tex' && $outputtarget ne 'export') {
$discussion.="\n<tr>";
}
- my $thisdepth=$depth[$alldiscussion{$_}];
+ my $thisdepth=$depth[$alldiscussion{$post}];
if ($outputtarget ne 'tex' && $outputtarget ne 'export') {
for (1..$thisdepth) {
$discussion.='<td> </td>';
@@ -496,52 +503,52 @@ imscp_v1p1.xsd http://www.imsglobal.org/
my $colspan=$maxdepth-$thisdepth+1;
if ($outputtarget eq 'tex') {
#cleanup block
- $discussionitems[$alldiscussion{$_}]=~s/<table([^>]*)>/<table TeXwidth="90 mm">/;
- $discussionitems[$alldiscussion{$_}]=~s/<tr([^>]*)><td([^>]*)>/<tr><td TeXwidth="20 mm" align="left">/;
+ $discussionitems[$alldiscussion{$post}]=~s/<table([^>]*)>/<table TeXwidth="90 mm">/;
+ $discussionitems[$alldiscussion{$post}]=~s/<tr([^>]*)><td([^>]*)>/<tr><td TeXwidth="20 mm" align="left">/;
my $threadinsert='';
if ($thisdepth > 0) {
$threadinsert='<br /><strong>Reply: '.$thisdepth.'</strong>';
}
- $discussionitems[$alldiscussion{$_}]=~s/<\/td><td([^>]*)>/$threadinsert<\/td><td TeXwidth="65 mm" align="left">/;
- $discussionitems[$alldiscussion{$_}]=~s/<a([^>]+)>(Edit|Hide|Delete|Reply|Submissions)<\/a>//g;
- $discussionitems[$alldiscussion{$_}]=~s/(<b>|<\/b>|<\/a>|<a([^>]+)>)//g;
+ $discussionitems[$alldiscussion{$post}]=~s/<\/td><td([^>]*)>/$threadinsert<\/td><td TeXwidth="65 mm" align="left">/;
+ $discussionitems[$alldiscussion{$post}]=~s/<a([^>]+)>(Edit|Hide|Delete|Reply|Submissions)<\/a>//g;
+ $discussionitems[$alldiscussion{$post}]=~s/(<b>|<\/b>|<\/a>|<a([^>]+)>)//g;
- $discussionitems[$alldiscussion{$_}]='<tex>\vskip 0 mm\noindent\makebox[2 cm][b]{\hrulefill}</tex>'.$discussionitems[$alldiscussion{$_}];
- $discussion.=$discussionitems[$alldiscussion{$_}];
+ $discussionitems[$alldiscussion{$post}]='<tex>\vskip 0 mm\noindent\makebox[2 cm][b]{\hrulefill}</tex>'.$discussionitems[$alldiscussion{$post}];
+ $discussion.=$discussionitems[$alldiscussion{$post}];
} elsif ($outputtarget eq 'export') {
- my $postfilename = $alldiscussion{$_}.'-'.$imsitems{$alldiscussion{$_}}{'timestamp'}.'.html';
+ my $postfilename = $alldiscussion{$post}.'-'.$imsitems{$alldiscussion{$post}}{'timestamp'}.'.html';
if ($manifestok) {
- if (($depth[$alldiscussion{$_}] <= $currdepth) && ($alldiscussion{$_} != $firstidx)) {
+ if (($depth[$alldiscussion{$post}] <= $currdepth) && ($alldiscussion{$post} != $firstidx)) {
print $manifestfile ' </item>'."\n";
}
- $currdepth = $depth[$alldiscussion{$_}];
+ $currdepth = $depth[$alldiscussion{$post}];
print $manifestfile "\n".
- '<item identifier="ITEM-'.$ressymb.'-'.$alldiscussion{$_}.'" isvisible="'.
- $imsitems{$alldiscussion{$_}}{'isvisible'}.'" identifieref="RES-'.$ressymb.'-'.$alldiscussion{$_}.'">'.
- '<title>'.$imsitems{$alldiscussion{$_}}{'title'}.'</title>';
+ '<item identifier="ITEM-'.$ressymb.'-'.$alldiscussion{$post}.'" isvisible="'.
+ $imsitems{$alldiscussion{$post}}{'isvisible'}.'" identifieref="RES-'.$ressymb.'-'.$alldiscussion{$post}.'">'.
+ '<title>'.$imsitems{$alldiscussion{$post}}{'title'}.'</title>';
$imsresources .= "\n".
- '<resource identifier="RES-'.$ressymb.'-'.$alldiscussion{$_}.'" type="webcontent" href="'.$postfilename.'">'."\n".
+ '<resource identifier="RES-'.$ressymb.'-'.$alldiscussion{$post}.'" type="webcontent" href="'.$postfilename.'">'."\n".
'<file href="'.$postfilename.'">'."\n".
- $imsfiles{$alldiscussion{$_}}{$imsitems{$alldiscussion{$_}}{'currversion'}}."\n".
+ $imsfiles{$alldiscussion{$post}}{$imsitems{$alldiscussion{$post}}{'currversion'}}."\n".
'</resource>';
}
my $postingfile;
my $postingfilename = $tempexport.'/'.$postfilename;
if ($postingfile = Apache::File->new('>'.$postingfilename)) {
print $postingfile '<html><head><title>Discussion Post</title></head><body>'.
- $imsitems{$alldiscussion{$_}}{'title'}.' '.
- $imsitems{$alldiscussion{$_}}{'sender'}.
- $imsitems{$alldiscussion{$_}}{'timestamp'}.'<br /><br />'.
- $imsitems{$alldiscussion{$_}}{'message'}.'<br />'.
- $imsitems{$alldiscussion{$_}}{'attach'}.'</body></html>'."\n";
+ $imsitems{$alldiscussion{$post}}{'title'}.' '.
+ $imsitems{$alldiscussion{$post}}{'sender'}.
+ $imsitems{$alldiscussion{$post}}{'timestamp'}.'<br /><br />'.
+ $imsitems{$alldiscussion{$post}}{'message'}.'<br />'.
+ $imsitems{$alldiscussion{$post}}{'attach'}.'</body></html>'."\n";
close($postingfile);
} else {
- $discussion .= 'An error occurred opening the export file for posting '.$alldiscussion{$_}.'<br />';
+ $discussion .= $lt{'aerr'}.' '.$alldiscussion{$post}.'<br />';
}
- $copyresult.=&replicate_attachments($imsitems{$alldiscussion{$_}}{'allattachments'},$tempexport);
+ $copyresult.=&replicate_attachments($imsitems{$alldiscussion{$post}}{'allattachments'},$tempexport);
} else {
- $discussion.='<td bgcolor="'.$bgcols[$newitem{$alldiscussion{$_}}].
- '" colspan="'.$colspan.'">'. $discussionitems[$alldiscussion{$_}].
+ $discussion.='<td bgcolor="'.$bgcols[$newitem{$alldiscussion{$post}}].
+ '" colspan="'.$colspan.'">'. $discussionitems[$alldiscussion{$post}].
'</td></tr>';
}
}
@@ -596,7 +603,6 @@ END
$discussion .= &mt('Posts by').':';
if ($totposters > 0) {
foreach my $poster (@posters) {
- $poster =~ s/:/\@/;
$discussion .= ' '.$poster.',';
}
$discussion =~ s/,$//;
@@ -609,10 +615,14 @@ END
$filterchoice = '<i>'.&mt('sections').'</i>- '.$env{'form.sectionpick'};
$filterchoice .= ' ';
}
+ if (@grouppick > 0) {
+ $filterchoice = '<i>'.&mt('groups').'</i>- '.$env{'form.grouppick'};
+ $filterchoice .= ' ';
+ }
if (@rolefilter > 0) {
$filterchoice .= '<i>'.&mt('roles').'</i>-';
- foreach (@rolefilter) {
- $filterchoice .= ' '.$role_types{$_}.',';
+ foreach my $role (@rolefilter) {
+ $filterchoice .= ' '.$role_types{$role}.',';
}
$filterchoice =~ s/,$//;
$filterchoice .= '<br />     ';
@@ -639,9 +649,13 @@ END
</table>
</td>
</tr>
- </table>
- <br /><br /></form>
END
+ $discussion .= &action_links_bar($colspan,$ressymb,$visible,
+ $newpostsflag,$group,
+ $prevread,$markondisp);
+ $discussion .= "
+ </table>
+ <br /><br /></form>\n";
}
if ($outputtarget eq 'export') {
if ($manifestok) {
@@ -673,13 +687,13 @@ END
open(OUTPUT, "zip -r $imszip * 2> /dev/null |");
close(OUTPUT);
chdir $cwd;
- $discussion .= 'Download the zip file from <a href="'.$imszipfile.'">Discussion Posting Archive</a><br />';
+ $discussion .= &mt('Download the zip file from [_1]Discussion Posting Archive','<a href="'.$imszipfile.'">').'</a><br />';
if ($copyresult) {
- $discussion .= 'The following errors occurred during export - <br />'.$copyresult;
+ $discussion .= &mt('The following errors occurred during export').' - <br />'.$copyresult;
}
}
} else {
- $discussion .= '<br />Unfortunately you will not be able to retrieve an archive of the discussion posts at this time, because there was a problem creating a manifest file.<br />';
+ $discussion .= '<br />'.&mt('Unfortunately you will not be able to retrieve an archive of the discussion posts at this time, because there was a problem creating a manifest file.').'<br />';
}
return $discussion;
}
@@ -687,93 +701,209 @@ END
if ($discussiononly) {
my $now = time;
my $attachnum = 0;
- my $newattachmsg = '';
- my @currnewattach = ();
- my @currdelold = ();
+ my $currnewattach = [];
+ my $currdelold = [];
my $comment = '';
my $subject = '';
if ($env{'form.origpage'}) {
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['addnewattach','deloldattach','delnewattach','timestamp','idx','subject','comment']);
- $subject = &Apache::lonnet::unescape($env{'form.subject'});
- $comment = &Apache::lonnet::unescape($env{'form.comment'});
+ $subject = &unescape($env{'form.subject'});
+ $comment = &unescape($env{'form.comment'});
my @keepold = ();
- &process_attachments(\@currnewattach,\@currdelold,\@keepold);
- if (@currnewattach > 0) {
- $attachnum += @currnewattach;
+ &process_attachments($currnewattach,$currdelold,\@keepold);
+ if (@{$currnewattach} > 0) {
+ $attachnum += @{$currnewattach};
}
}
if (&discussion_open($status)) {
- $discussion.=(<<ENDDISCUSS);
-<form action="/adm/feedback" method="post" name="mailform" enctype="multipart/form-data">
-<input type="submit" name="discuss" value="Post Discussion" />
-<input type="submit" name="anondiscuss" value="Post Anonymous Discussion" />
-<input type="hidden" name="symb" value="$ressymb" />
-<input type="hidden" name="sendit" value="true" />
-<input type="hidden" name="timestamp" value="$now" />
-<br /><a name="newpost"></a>
-<font size="1">Note: in anonymous discussion, your name is visible only
-to course faculty</font><br />
-<b>Title:</b> <input type="text" name="subject" value="$subject" size="30" /><br /><br />
-<textarea name="comment" cols="80" rows="14" wrap="hard">$comment</textarea>
-ENDDISCUSS
- if ($env{'form.origpage'}) {
- $discussion.='<input type="hidden" name="origpage" value="'.$env{'form.origpage'}.'" />'."\n";
- foreach (@currnewattach) {
- $discussion.='<input type="hidden" name="currnewattach" value="'.$_.'" />'."\n";
- }
- }
- $discussion.="</form>\n";
- if ($outputtarget ne 'tex') {
- $discussion.=&generate_attachments_button('',$attachnum,$ressymb,$now,\@currnewattach,\@currdelold,'',$mode);
- if (@currnewattach > 0) {
- $newattachmsg .= '<b>New attachments</b><br />';
- if (@currnewattach > 1) {
- $newattachmsg .= '<ol>';
- foreach my $item (@currnewattach) {
- $item =~ m#.*/([^/]+)$#;
- $newattachmsg .= '<li><a href="'.$item.'">'.$1.'</a></li>'."\n";
- }
- $newattachmsg .= '</ol>'."\n";
- } else {
- $currnewattach[0] =~ m#.*/([^/]+)$#;
- $newattachmsg .= '<a href="'.$currnewattach[0].'">'.$1.'</a><br />'."\n";
- }
+ if (($group ne '') && ($mode eq 'board')) {
+ if (&check_group_priv($group,'pgd') eq 'ok') {
+ $discussion .=
+ &postingform_display($mode,$ressymb,$now,$subject,
+ $comment,$outputtarget,$attachnum,
+ $currnewattach,$currdelold,
+ $group);
}
- $discussion.=$newattachmsg;
- $discussion.=&generate_preview_button();
- }
+ } else {
+ $discussion.=
+ &postingform_display($mode,$ressymb,$now,$subject,
+ $comment,$outputtarget,$attachnum,
+ $currnewattach,$currdelold);
+ }
}
} else {
- $discussion.='<table bgcolor="#BBBBBB"><tr><td>';
+ $discussion.='<table class="LC_feedback_link"><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.='<a href="/adm/feedback?replydisc='.
- &Apache::lonnet::escape($ressymb).':::" '.$target.'>'.
- '<img src="'.&Apache::loncommon::lonhttpdurl('/adm/lonMisc/chat.gif').'" border="0" />'.
- &mt('Post Discussion').'</a><br />';
+ $discussion.= &send_feedback_link($ressymb,$target).
+ '<br />';
}
}
- $discussion.='<a href="/adm/feedback?sendmessageonly=1&symb='.
- &Apache::lonnet::escape($ressymb).
- '"><img src="'.&Apache::loncommon::lonhttpdurl('/adm/lonMisc/feedback.gif').'" border="0" />'.
- &mt('Send Message').'</td></tr></table>';
+ if ($outputtarget ne 'tex') {
+ $discussion.= &send_message_link($ressymb);
+ }
+ $discussion.='</td></tr></table>';
}
return $discussion;
}
+sub send_feedback_link {
+ my ($ressymb,$target) = @_;
+ my $output = '<span class="LC_feedback_link">'.
+ ' <a href="/adm/feedback?replydisc='.
+ &escape($ressymb).':::" '.$target.'>'.
+ '<img alt="" src="'.
+ &Apache::loncommon::lonhttpdurl('/adm/lonMisc/chat.gif').
+ '" border="0" />'.&mt('Post Discussion').'</a></span>';
+ return $output;
+}
+
+sub send_message_link {
+ my ($ressymb) = @_;
+ my $output = '<span class="LC_feedback_link">'.
+ ' <a href="/adm/feedback?sendmessageonly=1&symb='.
+ &escape($ressymb).'"><img alt="" src="'.
+ &Apache::loncommon::lonhttpdurl('/adm/lonMisc/feedback.gif').
+ '" border="0" />'.&mt('Send Message').'</a></span>';
+ return $output;
+}
+
+sub action_links_bar {
+ my ($colspan,$ressymb,$visible,$newpostsflag,$group,$prevread,$markondisp) = @_;
+ my $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='.$escsymb;
+ if ($newpostsflag) {
+ $discussion .= '&previous='.$prevread;
+ }
+ $discussion .= &group_args($group);
+ $discussion .='">'.&mt('Threaded View').'</a> '.
+ '<a href="/adm/feedback?cmd=threadedoff&symb='.$escsymb;
+ if ($newpostsflag) {
+ $discussion .= '&previous='.$prevread;
+ }
+ $discussion .= &group_args($group);
+ $discussion .='">'.&mt('Chronological View').'</a>
+ <a href= "/adm/feedback?cmd=sortfilter&symb='.$escsymb;
+ if ($newpostsflag) {
+ $discussion .= '&previous='.$prevread;
+ }
+ $discussion .= &group_args($group);
+ $discussion .='">'.&mt('Sorting/Filtering options').'</a>  ';
+ } else {
+ $discussion .= '<td align="left">';
+ }
+ $discussion .='<a href= "/adm/feedback?export='.$escsymb;
+ if ($newpostsflag) {
+ $discussion .= '&previous='.$prevread;
+ }
+ $discussion .= &group_args($group);
+ $discussion .= '">'.&mt('Export').'?</a> </td>';
+ if ($newpostsflag) {
+ if (!$markondisp) {
+ $discussion .='<td align="right"><a href="/adm/preferences?action=changediscussions';
+ $discussion .= &group_args($group);
+ $discussion .= '">'.
+ &mt('Preferences on what is marked as NEW').
+ '</a><br /><a href="/adm/feedback?markread=1&symb='.$escsymb;
+ $discussion .= &group_args($group);
+ $discussion .= '">'.&mt('Mark NEW posts no longer new').'</a>';
+ } else {
+ $discussion .= '<td> </td>';
+ }
+ } else {
+ $discussion .= '<td> </td>';
+ }
+ $discussion .= '</tr></table></td></tr>';
+ return $discussion;
+}
+
+sub postingform_display {
+ my ($mode,$ressymb,$now,$subject,$comment,$outputtarget,$attachnum,
+ $currnewattach,$currdelold,$group) = @_;
+ my $newattachmsg;
+ my %lt = &Apache::lonlocal::texthash(
+ 'note' => 'Note: in anonymous discussion, your name is visible only to course faculty',
+ 'title' => 'Title',
+ 'podi' => 'Post Discussion',
+ 'poan' => 'Post Anonymous Discussion',
+ 'newa' => 'New attachments',
+ );
+ my $postingform = (<<ENDDISCUSS);
+<form action="/adm/feedback" method="post" name="mailform" enctype="multipart/form-data"> <input type="submit" name="discuss" value="$lt{'podi'}" />
+<input type="submit" name="anondiscuss" value="$lt{'poan'}" /> <input type="hidden" name="symb" value="$ressymb" />
+<input type="hidden" name="sendit" value="true" />
+<input type="hidden" name="timestamp" value="$now" />
+<br /><a name="newpost"></a>
+<font size="1">$lt{'note'}</font><br />
+<b>$lt{'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'}) {
+ $postingform .= '<input type="hidden" name="origpage" value="'.
+ $env{'form.origpage'}.'" />'."\n";
+ foreach my $att (@{$currnewattach}) {
+ $postingform .= '<input type="hidden" name="currnewattach" '.
+ 'value="'.$att.'" />'."\n";
+ }
+ }
+ if (exists($env{'form.ref'})) {
+ $postingform .= '<input type="hidden" name="ref" value="'.
+ $env{'form.ref'}.'" />';
+ }
+ if ($group ne '') {
+ $postingform .='<input type="hidden" name="group" value="'.$group.'" />';
+ }
+ my $blockblog = &Apache::loncommon::blocking_status('blogs');
+ if (!$blockblog) {
+ $postingform .= &add_blog_checkbox();
+ }
+ $postingform .= "</form>\n";
+ if ($outputtarget ne 'tex') {
+ $postingform .= &generate_attachments_button('',$attachnum,$ressymb,
+ $now,$currnewattach,
+ $currdelold,'',$mode,
+ $blockblog);
+ if ((ref($currnewattach) eq 'ARRAY') && (@{$currnewattach} > 0)) {
+ $newattachmsg = '<br /><b>'.$lt{'newa'}.'</b><br />';
+ if (@{$currnewattach} > 1) {
+ $newattachmsg .= '<ol>';
+ foreach my $item (@{$currnewattach}) {
+ $item =~ m#.*/([^/]+)$#;
+ $newattachmsg .= '<li><a href="'.$item.'">'.$1.'</a></li>'."\n";
+ }
+ $newattachmsg .= '</ol>'."\n";
+ } else {
+ $$currnewattach[0] =~ m#.*/([^/]+)$#;
+ $newattachmsg .= '<a href="'.$$currnewattach[0].'">'.$1.'</a><br />'."\n";
+ }
+ }
+ $postingform .= $newattachmsg;
+ $postingform .= &generate_preview_button();
+ }
+ return $postingform;
+}
+
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,$anonhash,$anoncnt) = @_;
+ 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,$grouppick,$classgroups,$statusfilter,$toggkey,$outputtarget,$anonhash,$anoncnt,$group) = @_;
my @original=();
my @index=();
+ my $skip_group_check = 0;
my $symb=&Apache::lonenc::check_decrypt($ressymb);
- my $escsymb=&Apache::lonnet::escape($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'});
+ if ((@{$grouppick} == 0) || (grep(/^all$/,@{$grouppick}))) {
+ $skip_group_check = 1;
+ }
if ($contrib{'version'}) {
my $oldest = $contrib{'1:timestamp'};
if ($prevread eq '0') {
@@ -781,7 +911,8 @@ sub build_posting_display {
}
my ($skiptest,$rolematch,$roleregexp,$secregexp,$statusregexp);
if ($sortposts) {
- ($skiptest,$roleregexp,$secregexp,$statusregexp) = &filter_regexp($rolefilter,$sectionpick,$statusfilter);
+ ($skiptest,$roleregexp,$secregexp,$statusregexp) =
+ &filter_regexp($rolefilter,$sectionpick,$statusfilter);
$rolematch = $roleregexp.':'.$secregexp.':'.$statusregexp;
}
for (my $id=1;$id<=$contrib{'version'};$id++) {
@@ -820,7 +951,7 @@ sub build_posting_display {
$$visible++;
if ($contrib{$idx.':history'}) {
if ($contrib{$idx.':history'} =~ /:/) {
- my @oldversions = split/:/,$contrib{$idx.':history'};
+ my @oldversions = split(/:/,$contrib{$idx.':history'});
$numoldver = @oldversions;
} else {
$numoldver = 1;
@@ -859,18 +990,18 @@ sub build_posting_display {
if ($subject eq '') {
if (defined($$subjectsort{'__No subject'})) {
- push @{$$subjectsort{'__No subject'}}, $idx;
+ push(@{$$subjectsort{'__No subject'}}, $idx);
} else {
@{$$subjectsort{'__No subject'}} = ("$idx");
}
} else {
if (defined($$subjectsort{$subject})) {
- push @{$$subjectsort{$subject}}, $idx;
+ push(@{$$subjectsort{$subject}}, $idx);
} else {
@{$$subjectsort{$subject}} = ("$idx");
}
}
- if ((!$contrib{$idx.':anonymous'}) || ($seeid)) {
+ if ((!$contrib{$idx.':anonymous'}) || (&Apache::lonnet::allowed('rin',$env{'request.course.id'}.($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:'')))) {
$sender=&Apache::loncommon::aboutmewrapper(
$plainname,
$contrib{$idx.':sendername'},
@@ -887,7 +1018,7 @@ sub build_posting_display {
%{$$usernamesort{$contrib{$idx.':senderdomain'}}} = ();
}
if (defined($$usernamesort{$contrib{$idx.':senderdomain'}}{$contrib{$idx.':sendername'}})) {
- push @{$$usernamesort{$contrib{$idx.':senderdomain'}}{$contrib{$idx.':sendername'}}}, $idx;
+ push(@{$$usernamesort{$contrib{$idx.':senderdomain'}}{$contrib{$idx.':sendername'}}}, $idx);
} else {
@{$$usernamesort{$contrib{$idx.':senderdomain'}}{$contrib{$idx.':sendername'}}} = ("$idx");
}
@@ -907,20 +1038,23 @@ sub build_posting_display {
%{$$namesort{$lastname}} = ();
}
if (defined($$namesort{$lastname}{$firstname})) {
- push @{$$namesort{$lastname}{$firstname}}, $idx;
+ push(@{$$namesort{$lastname}{$firstname}}, $idx);
} else {
@{$$namesort{$lastname}{$firstname}} = ("$idx");
}
- if (&editing_allowed()) {
+ if (&editing_allowed($escsymb.':::'.$idx,$group)) {
if (($env{'user.domain'} eq $contrib{$idx.':senderdomain'}) && ($env{'user.name'} eq $contrib{$idx.':sendername'})) {
$sender.=' <a href="/adm/feedback?editdisc='.
$escsymb.':::'.$idx;
if ($$newpostsflag) {
$sender .= '&previous='.$prevread;
}
- $sender .= '" '.$target.'>'.&mt('Edit').'</a>';
+ $sender .= &group_args($group);
+ $sender .= '" '.$target.'>'.&mt('Edit').'</a>';
+
unless ($seeid) {
- $sender.=" <a href=\"javascript:studentdelete('$escsymb','$idx','$$newpostsflag','$prevread')";
+ my $grpargs = &group_args($group);
+ $sender.=" <a href=\"javascript:verifydelete('studentdelete','$escsymb','$idx','$$newpostsflag','$prevread','$grpargs')";
$sender .= '">'.&mt('Delete').'</a>';
}
}
@@ -941,14 +1075,13 @@ sub build_posting_display {
if ($$newpostsflag) {
$sender .= '&previous='.$prevread;
}
+ $sender .= &group_args($group);
$sender .= '">'.&mt('Hide').'</a>';
- }
- $sender.=' <a href="/adm/feedback?deldisc='.
- $escsymb.':::'.$idx;
- if ($$newpostsflag) {
- $sender .= '&previous='.$prevread;
- }
- $sender .= '">'.&mt('Delete').'</a>';
+ }
+ my $grpargs = &group_args($group);
+ $sender.=
+ " <a href=\"javascript:verifydelete('seeiddelete','$escsymb','$idx','$$newpostsflag','$prevread','$grpargs')\">";
+ $sender .= &mt('Delete').'</a>';
}
} else {
if ($screenname) {
@@ -961,7 +1094,7 @@ sub build_posting_display {
%{$$usernamesort{'__anon'}} = ();
}
if (defined($$usernamesort{'__anon'}{'__anon'})) {
- push @{$$usernamesort{'__anon'}{'__anon'}}, $idx;
+ push(@{$$usernamesort{'__anon'}{'__anon'}}, $idx);
} else {
@{$$usernamesort{'__anon'}{'__anon'}} = ("$idx");
}
@@ -970,21 +1103,32 @@ sub build_posting_display {
%{$$namesort{'__anon'}} = ();
}
if (defined($$namesort{'__anon'}{'__anon'})) {
- push @{$$namesort{'__anon'}{'__anon'}}, $idx;
+ push(@{$$namesort{'__anon'}{'__anon'}}, $idx);
} else {
@{$$namesort{'__anon'}{'__anon'}} = ("$idx");
}
}
- if (&discussion_open($status) &&
- &Apache::lonnet::allowed('pch',
- $env{'request.course.id'}.
- ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''))) {
- $sender.=' <a href="/adm/feedback?replydisc='.
- $escsymb.':::'.$idx;
- if ($$newpostsflag) {
- $sender .= '&previous='.$prevread;
+ if (&discussion_open($status)) {
+ if (($group ne '') &&
+ (&check_group_priv($group,'pgd') eq 'ok')) {
+ $sender.=' <a href="/adm/feedback?replydisc='.
+ $escsymb.':::'.$idx;
+ if ($$newpostsflag) {
+ $sender .= '&previous='.$prevread;
+ }
+ $sender .= &group_args($group);
+ $sender .= '" '.$target.'>'.&mt('Reply').'</a>';
+ } elsif (&Apache::lonnet::allowed('pch',
+ $env{'request.course.id'}.
+ ($env{'request.course.sec'}?'/'.
+ $env{'request.course.sec'}:''))) {
+ $sender.=' <a href="/adm/feedback?replydisc='.
+ $escsymb.':::'.$idx;
+ if ($$newpostsflag) {
+ $sender .= '&previous='.$prevread;
+ }
+ $sender .= '" '.$target.'>'.&mt('Reply').'</a>';
}
- $sender .= '" '.$target.'>'.&mt('Reply').'</a>';
}
if ($viewgrades) {
$vgrlink=&Apache::loncommon::submlink('Submissions',
@@ -1041,7 +1185,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 ($env{'form.totposters'} ne '') {
if ($totposters == 0) {
$$shown{$idx} = 0;
} elsif ($totposters > 0) {
@@ -1066,6 +1210,23 @@ sub build_posting_display {
}
}
}
+ if ($$shown{$idx} && !$skip_group_check) {
+ my $showflag = 0;
+ if (ref($$classgroups{$poster}{active}) eq 'HASH') {
+ foreach my $grp (@{$grouppick}) {
+ if (grep/^\Q$grp\E$/,
+ keys(%{$$classgroups{$poster}{active}})) {
+ $showflag = 1;
+ last;
+ }
+ }
+ }
+ if ($showflag) {
+ $$shown{$idx} = 1;
+ } else {
+ $$shown{$idx} = 0;
+ }
+ }
} else {
$$shown{$idx} = 1;
}
@@ -1096,11 +1257,13 @@ 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='.$escsymb.':::'.$idx.'">'.&mt('Display all versions').'</a>';
+ $$discussionitems[$idx] .= ' <a href="/adm/feedback?allversions='.$escsymb.':::'.$idx;
+ $$discussionitems[$idx] .= &group_args($group);
+ $$discussionitems[$idx] .= '">'.&mt('Display all versions').'</a>';
}
$$discussionitems[$idx].='<br/>'.&mt('Earlier version(s) were posted on: ');
if ($contrib{$idx.':history'} =~ m/:/) {
- @postversions = split/:/,$contrib{$idx.':history'};
+ @postversions = split(/:/,$contrib{$idx.':history'});
} else {
@postversions = ("$contrib{$idx.':history'}");
}
@@ -1123,9 +1286,9 @@ sub filter_regexp {
my $skiptest = 1;
if (@{$rolefilter} > 0) {
my @okrolefilter = ();
- foreach (@{$rolefilter}) {
- unless ($_ eq '') {
- push @okrolefilter, $_;
+ foreach my $role (@{$rolefilter}) {
+ unless ($role eq '') {
+ push(@okrolefilter, $role);
}
}
if (@okrolefilter > 0) {
@@ -1143,9 +1306,9 @@ sub filter_regexp {
}
if (@{$sectionpick} > 0) {
my @oksectionpick = ();
- foreach (@{$sectionpick}) {
- unless ($_ eq '') {
- push @oksectionpick, $_;
+ foreach my $sec (@{$sectionpick}) {
+ unless ($sec eq '') {
+ push(@oksectionpick, $sec);
}
}
if ((@oksectionpick > 0) && (!grep/^all$/,@oksectionpick)) {
@@ -1159,6 +1322,7 @@ sub filter_regexp {
$secregexp .= '[^:]*';
}
}
+
if (defined($statusfilter) && $statusfilter ne '') {
if ($statusfilter eq 'all') {
$statusregexp = '[^:]+';
@@ -1179,7 +1343,7 @@ sub get_post_contents {
%{$$imsfiles{$idx}}=();
if ($type eq 'allversions') {
unless($seeid) {
- $discussion=&mt('You do not have privileges to view all versions of posts.').&mt('Please select a different role');
+ $discussion=&mt('You do not have privileges to view all versions of posts.').' '.&mt('Please select a different role.');
return $discussion;
}
}
@@ -1206,7 +1370,7 @@ sub get_post_contents {
}
&get_post_versions($messages,$$contrib{$idx.':message'},1);
&get_post_versions($subjects,$$contrib{$idx.':subject'},1);
- push @postversions,$$contrib{$idx.':timestamp'};
+ push(@postversions,$$contrib{$idx.':timestamp'});
$end = @postversions;
} else {
&get_post_versions($messages,$$contrib{$idx.':message'},1,$numver);
@@ -1233,9 +1397,9 @@ sub get_post_contents {
if ($type eq 'export') {
$$imsfiles{$idx}{$i} = '';
if ($attachmsg) {
- $$attachtxt{$i} = '<br />Attachments:<br />';
- foreach (sort keys %currattach) {
- if ($$allattachments{$_}{'filename'} =~ m-^/uploaded/([^/]+/[^/]+)(/feedback)?(/?\d*)/([^/]+)$-) {
+ $$attachtxt{$i} = '<br />'.&mt('Attachments').':<br />';
+ foreach my $key (sort(keys(%currattach))) {
+ if ($$allattachments{$key}{'filename'} =~ m-^/uploaded/([^/]+/[^/]+)(/feedback)?(/?\d*)/([^/]+)$-) {
my $fname = $1.$3.'/'.$4;
$$imsfiles{$idx}{$i} .= '<file href="'.$fname.'">'."\n";
$$attachtxt{$i}.= '<a href="'.$fname.'">'.$4.'</a><br />';
@@ -1244,7 +1408,7 @@ sub get_post_contents {
}
} else {
if ($attachmsg) {
- $$attachtxt{$i} = '<br />Attachments:'.$attachmsg.'<br />';
+ $$attachtxt{$i} = '<br />'.&mt('Attachments').':'.$attachmsg.'<br />';
} else {
$$attachtxt{$i} = '';
}
@@ -1268,11 +1432,11 @@ END
sub replicate_attachments {
my ($attachrefs,$tempexport) = @_;
my $response;
- foreach my $id (keys %{$attachrefs}) {
+ foreach my $id (keys(%{$attachrefs})) {
if ($$attachrefs{$id}{'filename'} =~ m-^/uploaded/([^/]+)/([^/]+)(/feedback)?(/?\d*)/([^/]+)$-) {
my $path = $tempexport;
my $tail = $1.'/'.$2.$4;
- my @extras = split/\//,$tail;
+ my @extras = split(/\//,$tail);
my $destination = $tempexport.'/'.$1.'/'.$2.$4.'/'.$5;
if (!-e $destination) {
my $i= 0;
@@ -1291,11 +1455,11 @@ sub replicate_attachments {
print $attachcopy $content;
close($attachcopy);
} else {
- $response .= 'Error copying file attachment - '.$5.' to IMS package: '.$!.'<br />'."\n";
+ $response .= &mt('Error copying file attachment - [_1] to IMS package',$5).': '.$!.'<br />'."\n";
}
} else {
&Apache::lonnet::logthis("Replication of attachment failed when building IMS export of discussion posts - domain: $1, course: $2, file: $$attachrefs{$id}{'filename'} -error: $rtncode");
- $response .= 'Error copying file attachment - '.$5.' to IMS package: '.$rtncode.'<br />'."\n";
+ $response .= &mt('Error copying file attachment - [_1] to IMS package: ',$5).$rtncode.'<br />'."\n";
}
}
}
@@ -1304,13 +1468,19 @@ sub replicate_attachments {
}
sub mail_screen {
- my ($r,$feedurl,$options) = @_;
+ my ($r,$feedurl,$options,$caller_symb) = @_;
if (exists($env{'form.origpage'})) {
- &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['subject','comment','currnewattach','addnewattach','deloldattach','delnewattach','timestamp','idx','anondiscuss','discuss','blog']);
+ &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['subject','comment','currnewattach','addnewattach','deloldattach','delnewattach','timestamp','idx','anondiscuss','discuss','blog','group','ref']);
}
- my $title=&Apache::lonnet::gettitle($feedurl);
- if (!$title) { $title = $feedurl; }
+ my %lt = &Apache::lonlocal::texthash(
+ 'plch' => 'Please check at least one of the following feedback types:',
+ 'myqu' => 'My question/comment/feedback:',
+ 'title' => 'Title',
+ 'reta' => 'Retained attachments',
+ 'atta' => 'Attachment (128 KB max size)',
+ );
+ my $restitle = &get_resource_title($caller_symb,$feedurl);
my $quote='';
my $subject = '';
my $comment = '';
@@ -1328,12 +1498,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
@@ -1341,13 +1514,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
}
@@ -1371,7 +1546,7 @@ END
unless (($contrib{'hidden'}=~/\.$idx\./) || ($contrib{'deleted'}=~/\.$idx\./)) {
if ($contrib{$idx.':history'}) {
if ($contrib{$idx.':history'} =~ /:/) {
- my @oldversions = split/:/,$contrib{$idx.':history'};
+ my @oldversions = split(/:/,$contrib{$idx.':history'});
$numoldver = @oldversions;
} else {
$numoldver = 1;
@@ -1380,24 +1555,21 @@ END
if ($env{'form.replydisc'}) {
if ($contrib{$idx.':history'}) {
if ($contrib{$idx.':history'} =~ /:/) {
- my @oldversions = split/:/,$contrib{$idx.':history'};
+ my @oldversions = split(/:/,$contrib{$idx.':history'});
$numoldver = @oldversions;
} else {
$numoldver = 1;
}
}
- my $message;
if ($idx > 0) {
my %msgversions = ();
&get_post_versions(\%msgversions,$contrib{$idx.':message'},0,$numoldver);
- $message = $msgversions{$numoldver};
+ $quote = $msgversions{$numoldver};
}
- &newline_to_br(\$message);
- $quote='<blockquote>'.&Apache::lontexconvert::msgtexconverted($message).'</blockquote>';
if ($idx > 0) {
my %subversions = ();
&get_post_versions(\%subversions,$contrib{$idx.':subject'},1,$numoldver);
- $subject = 'Re: '.$subversions{$numoldver};
+ $subject = &mt('Re: ').$subversions{$numoldver};
}
$subject = &HTML::Entities::encode($subject,'<>&"');
} else {
@@ -1414,20 +1586,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
}
@@ -1441,47 +1610,31 @@ 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 $send=&mt('Send');
+ my $alert = &mt('Please select a feedback type.');
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) {
- rec=1;
- }
- }
+ 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;
@@ -1494,7 +1647,7 @@ END
}
document.mailform.submit();
} else {
- alert('Please check a feedback type.');
+ alert('$alert');
}
}
$anonchk
@@ -1508,9 +1661,14 @@ END
&Apache::loncommon::start_page('Resource Feedback and Discussion',$js,
{'add_entries' => \%onload});
+ if ($quote ne '') {
+ &newline_to_br(\$quote);
+ $quote='<blockquote>'.&Apache::lontexconvert::msgtexconverted($quote).'</blockquote>';
+ }
+
$r->print(<<END);
$start_page
-<h2><tt>$title</tt></h2>
+<h2><tt>$restitle</tt></h2>
<form action="/adm/feedback" method="post" name="mailform"
enctype="multipart/form-data">
$prevtag
@@ -1527,13 +1685,13 @@ END
END
}
$r->print(<<END);
-Please check at least one of the following feedback types:
+$lt{'plch'}
$options<hr />
$quote
-<p>My question/comment/feedback:</p>
+<p>$lt{'myqu'}</p>
<p>
$latexHelp
-Title: <input type="text" name="subject" size="30" value="$subject" /></p>
+$lt{'title'}: <input type="text" name="subject" size="30" value="$subject" /></p>
<p>
<textarea name="comment" id="comment" cols="60" rows="10" wrap="hard">$comment
</textarea></p>
@@ -1541,28 +1699,34 @@ Title: <input type="text" name="subject"
END
if ( ($env{'form.editdisc'}) || ($env{'form.replydisc'}) ) {
if ($env{'form.origpage'}) {
- foreach (@currnewattach) {
- $r->print('<input type="hidden" name="currnewattach" value="'.$_.'" />'."\n");
+ foreach my $attach (@currnewattach) {
+ $r->print('<input type="hidden" name="currnewattach" value="'.$attach.'" />'."\n");
}
- foreach (@currdelold) {
- $r->print('<input type="hidden" name="deloldattach" value="'.$_.'" />'."\n");
+ foreach my $oldatt (@currdelold) {
+ $r->print('<input type="hidden" name="deloldattach" value="'.$oldatt.'" />'."\n");
}
}
if ($env{'form.editdisc'}) {
if ($attachmenturls) {
&extract_attachments($attachmenturls,$idx,$numoldver,\$attachmsg,\%attachments,\%currattach,\@currdelold);
- $attachnum = scalar(keys %currattach);
- foreach (keys %currattach) {
- $r->print('<input type="hidden" name="keepold" value="'.$_.'" />'."\n");
+ $attachnum = scalar(keys(%currattach));
+ foreach my $key (keys(%currattach)) {
+ $r->print('<input type="hidden" name="keepold" value="'.$key.'" />'."\n");
}
}
}
} else {
$r->print(<<END);
-Attachment (128 KB max size): <input type="file" name="attachment" />
+$lt{'atta'}: <input type="file" name="attachment" />
</p>
END
}
+ if (exists($env{'form.group'})) {
+ $r->print('<input type="hidden" name="group" value="'.$env{'form.group'}.'" />');
+ }
+ if (exists($env{'form.ref'})) {
+ $r->print('<input type="hidden" name="ref" value="'.$env{'form.ref'}.'" />');
+ }
$r->print(<<END);
<p>
<input type="hidden" name="sendit" value="1" />
@@ -1573,6 +1737,7 @@ END
if ($env{'form.editdisc'} || $env{'form.replydisc'}) {
my $now = time;
my $ressymb = $symb;
+ &Apache::lonenc::check_encrypt(\$ressymb);
my $postidx = '';
if ($env{'form.editdisc'}) {
$postidx = $idx;
@@ -1580,10 +1745,11 @@ END
if (@currnewattach > 0) {
$attachnum += @currnewattach;
}
- $r->print(&generate_attachments_button($postidx,$attachnum,$ressymb,$now,\@currnewattach,\@currdelold,$numoldver));
+ my $blockblog = &Apache::loncommon::blocking_status('blogs');
+ $r->print(&generate_attachments_button($postidx,$attachnum,$ressymb,$now,\@currnewattach,\@currdelold,$numoldver,'',$blockblog));
if ($attachnum > 0) {
if (@currnewattach > 0) {
- $newattachmsg .= '<b>New attachments</b><br />';
+ $newattachmsg .= '<br /><b>'.&mt('New attachments').'</b><br />';
if (@currnewattach > 1) {
$newattachmsg .= '<ol>';
foreach my $item (@currnewattach) {
@@ -1597,7 +1763,7 @@ END
}
}
if ($attachmsg) {
- $r->print("<b>Retained attachments</b>:$attachmsg<br />\n");
+ $r->print("<br /><b>$lt{'reta'}</b>:$attachmsg<br />\n");
}
if ($newattachmsg) {
$r->print("$newattachmsg<br />");
@@ -1754,44 +1920,45 @@ END
my $end_page =
&Apache::loncommon::end_page();
$r->print(<<END);
-<form name="modifydisp" method="POSTx" action="/adm/feedback">
+$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" />
@@ -1801,11 +1968,19 @@ $lt{'sdpf'}<br/> $lt{'prca'} <ol><li>$l
<input type="hidden" name="$markchg" value=""/>
<input type="hidden" name="$toggchg" value="" />
<input type="button" name="sub" value="Store Changes" onClick="javascript:setDisp()" />
+END
+ if (exists($env{'form.group'})) {
+ $r->print('<input type="hidden" name="group" value="'.$env{'form.group'}.'" />');
+ }
+ if (exists($env{'form.ref'})) {
+ $r->print('<input type="hidden" name="ref" value="'.$env{'form.ref'}.'" />');
+ }
+ $r->print("
<br />
<br />
</form>
$end_page
-END
+ ");
return;
}
@@ -1816,28 +1991,55 @@ 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 @groups;
+ my $group_sel = '';
+ my $numgroupvis = 5;
+ 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);
+ if (scalar(@sections) < 4) {
+ $numvisible = scalar(@sections) + 1;
+ }
unshift(@sections,'all'); # Put 'all' at the front of the list
- if ($numsections < 4) {
- $numvisible = $numsections + 1;
+
+ }
+ foreach my $sec (@sections) {
+ $section_sel .= " <option value=\"$sec\">$sec</option>\n";
+ }
+
+ if (&check_group_priv() eq 'ok') {
+ my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+ my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+ my %curr_groups = &Apache::longroup::coursegroups($cdom,$cnum);
+ @groups = sort {$a cmp $b} keys(%curr_groups);
+ if (scalar(@groups) < 4) {
+ $numgroupvis = scalar(@groups) + 1;
+ }
+ unshift(@groups,'all'); # Put 'all' at the front of the list
+ } else {
+ my @coursegroups = split(/:/,$env{'request.course.groups'});
+ if (@coursegroups > 0) {
+ @coursegroups = sort {$a cmp $b} @coursegroups;
+ @groups = ('all',@coursegroups);
+ if (scalar(@groups) < 4) {
+ $numgroupvis = scalar(@groups) + 1;
+ }
+ } else {
+ @groups = ('all');
+ $numgroupvis = 1;
}
}
- foreach (@sections) {
- $section_sel .= " <option value=\"$_\" />$_\n";
+ foreach my $group (@groups) {
+ $group_sel .= " <option value=\"$group\">$group</option>\n";
}
-
+
my $function = &Apache::loncommon::get_users_function();
my $tabcolor = &Apache::loncommon::designparm($function.'.tabbg',
$env{'user.domain'});
@@ -1850,8 +2052,10 @@ sub print_sortfilter_options {
'spur' => 'Specific user roles',
'sprs' => 'Specific role status',
'spse' => 'Specific sections',
+ 'spgr' => 'Specific groups',
'psub' => 'Pick specific users (by name)',
- 'shal' => 'Show a list of current posters'
+ 'shal' => 'Show a list of current posters',
+ 'stor' => 'Store changes',
);
my %sort_types = ();
@@ -1881,6 +2085,17 @@ function verifyFilter() {
if (secnum == 0) {
document.modifyshown.sectionpick.options[0].selected = true
}
+
+ var grpnum = 0
+ for (var i=0; i<document.modifyshown.grouppick.length; i++) {
+ if (document.modifyshown.grouppick.options[i].selected == true) {
+ grpnum ++
+ }
+ }
+ if (grpnum == 0) {
+ document.modifyshown.grouppick.options[0].selected = true
+ }
+
document.modifyshown.submit();
}
</script>
@@ -1906,60 +2121,76 @@ $start_page
<td> </td>
<td><b>$lt{'spse'}</b></td>
<td> </td>
+ <td><b>$lt{'spgr'}</b></td>
+ <td> </td>
<td><b>$lt{'psub'}</b></td>
</tr>
<tr>
- <td align="center">
+ <td align="center" valign="top">
<select name="sortposts">
- <option value="ascdate" selected="selected" />$sort_types{'ascdate'}
- <option value="descdate" />$sort_types{'descdate'}
- <option value="thread" />$sort_types{'thread'}
- <option value="subject" />$sort_types{'subject'}
- <option value="username" />$sort_types{'username'}
- <option value="lastfirst" />$sort_types{'lastfirst'}
+ <option value="ascdate" selected="selected">$sort_types{'ascdate'}</option>
+ <option value="descdate">$sort_types{'descdate'}</option>
+ <option value="thread">$sort_types{'thread'}</option>
+ <option value="subject">$sort_types{'subject'}</option>
+ <option value="username">$sort_types{'username'}</option>
+ <option value="lastfirst">$sort_types{'lastfirst'}</option>
</select>
</td>
<td> </td>
- <td align="center">
+ <td align="center" valign="top">
<select name="statusfilter">
- <option value="all" selected="selected" />$status_types{'all'}
- <option value="Active" />$status_types{'Active'}
- <option value="Expired" />$status_types{'Expired'}
+ <option value="all" selected="selected">$status_types{'all'}</option>
+ <option value="Active">$status_types{'Active'}</option>
+ <option value="Expired">$status_types{'Expired'}</option>
+ <option value="Future">$status_types{'Future'}</option>
</select>
</td>
<td> </td>
- <td align="center">
+ <td align="center" valign="top">
<select name="rolefilter" multiple="true" size="5">
- <option value="all" />$role_types{'all'}
- <option value="st" />$role_types{'st'}
- <option value="cc" />$role_types{'cc'}
- <option value="in" />$role_types{'in'}
- <option value="ta" />$role_types{'ta'}
- <option value="ep" />$role_types{'ep'}
- <option value="ad" />$role_types{'ad'}
- <option value="cr" />$role_types{'cr'}
+ <option value="all">$role_types{'all'}</option>
+ <option value="st">$role_types{'st'}</option>
+ <option value="cc">$role_types{'cc'}</option>
+ <option value="in">$role_types{'in'}</option>
+ <option value="ta">$role_types{'ta'}</option>
+ <option value="ep">$role_types{'ep'}</option>
+ <option value="cr">$role_types{'cr'}</option>
</select>
</td>
<td> </td>
- <td align="center">
+ <td align="center" valign="top">
<select name="sectionpick" multiple="true" size="$numvisible">
$section_sel
</select>
</td>
<td> </td>
- <td><label><input type="checkbox" name="posterlist" value="$symb" />$lt{'shal'}</label></td>
+ <td align="center" valign="top">
+ <select name="grouppick" multiple="true" size="$numvisible">
+ $group_sel
+ </select>
+ </td>
+ <td> </td>
+ <td valign="top"><label><input type="checkbox" name="posterlist" value="$symb" />$lt{'shal'}</label></td>
</tr>
</table>
<br />
<br />
<input type="hidden" name="previous" value="$previous" />
<input type="hidden" name="applysort" value="$symb" />
-<input type="button" name="sub" value="Store Changes" onClick="verifyFilter()" />
+<input type="button" name="sub" value="$lt{'stor'}" onClick="verifyFilter()" />
+END
+ if (exists($env{'form.group'})) {
+ $r->print('<input type="hidden" name="group" value="'.$env{'form.group'}.'" />');
+ }
+ if (exists($env{'form.ref'})) {
+ $r->print('<input type="hidden" name="ref" value="'.$env{'form.ref'}.'" />');
+ }
+ $r->print("
<br />
<br />
</form>
$end_page
-END
+");
}
sub print_showposters {
@@ -1974,19 +2205,36 @@ sub print_showposters {
$crs.='_'.$env{'request.course.sec'};
}
$crs=~s/\_/\//g;
- my $seeid=&Apache::lonnet::allowed('rin',$crs);
+ my $seeid;
+ my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+ my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+ my $group = $env{'form.group'};
+ my $ressymb = &wrap_symb($symb);
+ if (($group ne '') &&
+ ($ressymb =~ m|^bulletin___ \d+___adm/wrapper/adm/\Q$cdom\E/\Q$cnum\E/\d+/bulletinboard$|)) {
+ if (&check_group_priv($group,'dgp') eq 'ok') {
+ $seeid = 1;
+ }
+ } else {
+ $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'});
+ $cdom,$cnum);
my %namesort = ();
my %postcounts = ();
+ my %lt = &Apache::lonlocal::texthash(
+ sele => 'Select',
+ full => 'Fullname',
+ usdo => 'Username:domain',
+ post => 'Posts',
+ );
if ($contrib{'version'}) {
for (my $idx=1;$idx<=$contrib{'version'};$idx++) {
my $hidden=($contrib{'hidden'}=~/\.$idx\./);
my $deleted=($contrib{'deleted'}=~/\.$idx\./);
unless ((($hidden) && (!$seeid)) || ($deleted)) {
- if ((!$contrib{$idx.':anonymous'}) || ($seeid)) {
+ if ((!$contrib{$idx.':anonymous'}) || (&Apache::lonnet::allowed('rin',$env{'request.course.id'}.($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:'')))) {
my %names = &Apache::lonnet::get('environment',['firstname','lastname'],$contrib{$idx.':senderdomain'},$contrib{$idx.':sendername'});
my $lastname = $names{'lastname'};
my $firstname = $names{'firstname'};
@@ -2003,7 +2251,7 @@ sub print_showposters {
$postcounts{$poster} ++;
if (defined($namesort{$lastname}{$firstname})) {
if (!grep/^$poster$/,@{$namesort{$lastname}{$firstname}}) {
- push @{$namesort{$lastname}{$firstname}}, $poster;
+ push(@{$namesort{$lastname}{$firstname}}, $poster);
}
} else {
@{$namesort{$lastname}{$firstname}} = ("$poster");
@@ -2014,42 +2262,41 @@ sub print_showposters {
}
my $start_page = &Apache::loncommon::start_page('Discussion options');
-
+ my $table_start =&Apache::loncommon::start_data_table();
$r->print(<<END);
$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>#</th>
+ <th>$lt{'sele'}</th>
+ <th>$lt{'full'} <font color="#999999">($lt{'usdo'})</font></th>
+ <th>$lt{'post'}</th>
</tr>
END
my $count = 0;
- foreach my $last (sort keys %namesort) {
- foreach my $first (sort keys %{$namesort{$last}}) {
- foreach (sort @{$namesort{$last}{$first}}) {
- my ($uname,$udom) = split/:/,$_;
+ foreach my $last (sort(keys(%namesort))) {
+ foreach my $first (sort(keys(%{$namesort{$last}}))) {
+ foreach my $user (sort(@{$namesort{$last}{$first}})) {
+ my ($uname,$udom) = split(/:/,$user);
if (!$uname || !$udom) {
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="'.$user.'" /></td>
+ <td>'.$last.', '.$first.' ('.$uname.':'.$udom.')</label></td>
+ <td>'.$postcounts{$user}.'</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" />
@@ -2124,30 +2371,33 @@ sub get_post_attachments {
sub fail_redirect {
my ($r,$feedurl) = @_;
if ($feedurl=~/^\/adm\//) { $feedurl.='?register=1' };
+ my %lt = &Apache::lonlocal::texthash(
+ 'sorr' => 'Sorry, no recipients ...',
+ );
my $logo=&Apache::loncommon::lonhttpdurl('/adm/lonIcons/lonlogos.gif');
$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>
+<b>$lt{'sorr'}</b>
ENDFAILREDIR
$r->print(&Apache::loncommon::end_page());
}
sub redirect_back {
- my ($r,$feedurl,$typestyle,$sendsomething,$sendposts,$blog,$status,$previous,$sort,$rolefilter,$statusfilter,$sectionpick,$numpicks) = @_;
+ my ($r,$feedurl,$typestyle,$sendsomething,$sendposts,$blog,$status,$previous,$sort,$rolefilter,$statusfilter,$sectionpick,$grouppick,$numpicks,$group) = @_;
my $sorttag = '';
my $roletag = '';
my $statustag = '';
my $sectag = '';
+ my $grptag = '';
my $userpicktag = '';
my $qrystr = '';
my $prevtag = '';
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
-
&dewrapper(\$feedurl);
if ($feedurl=~/^\/adm\//) { $feedurl.='?register=1' };
if ($previous > 0) {
@@ -2175,9 +2425,9 @@ sub redirect_back {
if (ref($sectionpick) eq 'ARRAY') {
$feedurl .= '§ionpick=';
$sectag .= '<input type="hidden" name="sectionpick" value="';
- foreach (@{$sectionpick}) {
- $feedurl .= $_.',';
- $sectag .= $_.',';
+ foreach my $sec (@{$sectionpick}) {
+ $feedurl .= $sec.',';
+ $sectag .= $sec.',';
}
$feedurl =~ s/,$//;
$sectag =~ s/,$//;
@@ -2186,12 +2436,26 @@ sub redirect_back {
$feedurl .= '§ionpick='.$sectionpick;
$sectag = '<input type="hidden" name="sectionpick" value="'.$sectionpick.'" />';
}
+ if (ref($grouppick) eq 'ARRAY') {
+ $feedurl .= '&grouppick=';
+ $sectag .= '<input type="hidden" name="grouppick" value="';
+ foreach my $grp (@{$grouppick}) {
+ $feedurl .= $grp.',';
+ $grptag .= $grp.',';
+ }
+ $feedurl =~ s/,$//;
+ $grptag =~ s/,$//;
+ $grptag .= '" />';
+ } else {
+ $feedurl .= '&grouppick='.$grouppick;
+ $grptag = '<input type="hidden" name="grouppick" value="'.$grouppick.'" />';
+ }
if (ref($rolefilter) eq 'ARRAY') {
$feedurl .= '&rolefilter=';
$roletag .= '<input type="hidden" name="rolefilter" value="';
- foreach (@{$rolefilter}) {
- $feedurl .= $_.',';
- $roletag .= $_.',';
+ foreach my $role (@{$rolefilter}) {
+ $feedurl .= $role.',';
+ $roletag .= $role.',';
}
$feedurl =~ s/,$//;
$roletag =~ s/,$//;
@@ -2204,16 +2468,32 @@ sub redirect_back {
$statustag ='<input type="hidden" name="statusfilter" value="'.$statusfilter.'" />';
}
}
- $feedurl=&Apache::lonenc::check_encrypt($feedurl);
+ my $grouptag;
+ if ($group ne '') {
+ $grouptag = '<input type="hidden" name="group" value="'.$group.'" />'; my $refarg;
+ if (exists($env{'form.ref'})) {
+ $refarg = '&ref='.$env{'form.ref'};
+ $grouptag .= '<input type="hidden" name="ref" value="'.$env{'form.ref'}.'" />';
+ }
+ if ($feedurl =~ /\?/) {
+ $feedurl .= '&group='.$group.$refarg;
+ } else {
+ $feedurl .= '?group='.$group.$refarg;
+ }
+ }
+ &Apache::lonenc::check_encrypt(\$feedurl);
my $logo=&Apache::loncommon::lonhttpdurl('/adm/lonIcons/lonlogos.gif');
- my %onload = ('onload' => "if (window.name!='loncapaclient') { this.document.reldt.submit(); self.window.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],
+ &Apache::loncommon::start_page('Feedback sent',undef,
+ {'redirect' => [0,$feedurl],
'only_body' => 1,
'add_entries' => \%onload});
my $end_page = &Apache::loncommon::end_page();
-
$r->print(<<ENDREDIR);
$start_page
<img align="right" src="$logo" />
@@ -2227,7 +2507,9 @@ $sorttag
$statustag
$roletag
$sectag
+$grptag
$userpicktag
+$grouptag
</form>
$end_page
ENDREDIR
@@ -2237,9 +2519,15 @@ sub no_redirect_back {
my ($r,$feedurl) = @_;
my $nofeed=&mt('Sorry, no feedback possible on this resource ...');
+ 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 (window.name!='loncapaclient') { self.window.close(); }"});
+ 'add_entries' => \%onload,);
if ($feedurl !~ m{^/adm/feedback}) {
$body_options{'rediect'} = [2,$feedurl];
@@ -2250,7 +2538,7 @@ sub no_redirect_back {
my $end_page = &Apache::loncommon::end_page();
- $feedurl=&Apache::lonenc::check_encrypt($feedurl);
+ &Apache::lonenc::check_encrypt(\$feedurl);
my $logo=&Apache::loncommon::lonhttpdurl('/adm/lonIcons/lonlogos.gif');
$r->print (<<ENDNOREDIRTWO);
$start_page
@@ -2268,42 +2556,48 @@ 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>';
}
+ my %optionhash=();
+ foreach my $type ('question','comment','policy') {
+ $optionhash{$type}=$env{'course.'.$env{'request.course.id'}.'.'.$type.'.email.text'};
+ }
if (&feedback_available(1)) {
$msgoptions.=
- '<p><label><input type="checkbox" name="question" /> '.
- &mt('Question about resource content').'</label></p>';
+ '<p><label><input type="radio" name="discuss" value="question" /> '.
+ ($optionhash{'question'}?$optionhash{'question'}:&mt('Question about resource content')).'</label></p>';
}
if (&feedback_available(0,1)) {
$msgoptions.=
- '<p><label><input type="checkbox" name="course" /> '.
- &mt('Question/Comment/Feedback about course content').
+ '<p><label><input type="radio" name="discuss" value="course" /> '.
+ ($optionhash{'comment'}?$optionhash{'comment'}:&mt('Question/Comment/Feedback about course content')).
'</label></p>';
}
if (&feedback_available(0,0,1)) {
$msgoptions.=
- '<p><label><input type="checkbox" name="policy" /> '.
- &mt('Question/Comment/Feedback about course policy').
+ '<p><label><input type="radio" name="discuss" value="policy" /> '.
+ ($optionhash{'policy'}?$optionhash{'policy'}:&mt('Question/Comment/Feedback about course policy')).
'</label></p>';
}
}
if (($env{'request.course.id'}) && (!$env{'form.sendmessageonly'})) {
- if (&discussion_open(undef,$symb) &&
+ my ($blocked,$blocktext) = &Apache::loncommon::blocking_status('boards');
+ if (!$blocked && &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> '.
'<a href="/adm/preferences?action=changescreenname">'.&mt('Change Screenname').'</a>';
+ my $blockblog = &Apache::loncommon::blocking_status('blogs');
+ if (!$blockblog) {
+ $discussoptions.= &add_blog_checkbox();
+ }
}
- $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) {
@@ -2325,8 +2619,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
@@ -2350,134 +2645,48 @@ sub clear_out_html {
}
sub assemble_email {
- my ($feedurl,$message,$prevattempts,$usersaw,$useranswer)=@_;
+ my ($message,$prevattempts,$usersaw,$useranswer)=@_;
+ my %lt = &Apache::lonlocal::texthash(
+ 'prev' => 'Previous attempts of student (if applicable)',
+ 'orig' => 'Original screen output (if applicable)',
+ 'corr' => 'Correct Answer(s) (if applicable)',
+ );
my $email=<<"ENDEMAIL";
$message
ENDEMAIL
my $citations=<<"ENDCITE";
-<h2>Previous attempts of student (if applicable)</h2>
+<h2>$lt{'prev'}</h2>
$prevattempts
<br /><hr />
-<h2>Original screen output (if applicable)</h2>
+<h2>$lt{'orig'}</h2>
$usersaw
-<h2>Correct Answer(s) (if applicable)</h2>
+<h2>$lt{'corr'}</h2>
$useranswer
ENDCITE
return ($email,$citations);
}
-sub secapply {
- my $rec=shift;
- my $defaultflag=shift;
- $rec=~s/\s+//g;
- $rec=~s/\@/\:/g;
- my ($adr,$sections)=($rec=~/^([^\(]+)\(([^\)]+)\)/);
- if ($sections) {
- foreach (split(/\;/,$sections)) {
- if (($_ eq $env{'request.course.sec'}) ||
- ($defaultflag && ($_ eq '*'))) {
- return $adr;
- }
- }
- } else {
- return $rec;
- }
- 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 />';
- $feedurl=~/^\/res\/(\w+)\/(\w+)\//;
- $to{$2.':'.$1}=1;
- }
- if ($env{'form.question'}||$question) {
- $typestyle.='Submitting as Question<br />';
- foreach (split(/\,/,
- $env{'course.'.$env{'request.course.id'}.'.question.email'})
- ) {
- my $rec=&secapply($_,$defaultflag);
- if ($rec) { $to{$rec}=1; }
- }
- }
- if ($env{'form.course'}||$course) {
- $typestyle.='Submitting as Comment<br />';
- foreach (split(/\,/,
- $env{'course.'.$env{'request.course.id'}.'.comment.email'})
- ) {
- my $rec=&secapply($_,$defaultflag);
- if ($rec) { $to{$rec}=1; }
- }
- }
- if ($env{'form.policy'}||$policy) {
- $typestyle.='Submitting as Policy Feedback<br />';
- foreach (split(/\,/,
- $env{'course.'.$env{'request.course.id'}.'.policy.email'})
- ) {
- my $rec=&secapply($_,$defaultflag);
- if ($rec) { $to{$rec}=1; }
- }
- }
- if ((scalar(%to) eq '0') && (!$defaultflag)) {
- ($typestyle,%to)=
- &decide_receiver($feedurl,$author,$question,$course,$policy,1);
- }
- return ($typestyle,%to);
-}
sub feedback_available {
my ($question,$course,$policy)=@_;
- my ($typestyle,%to)=&decide_receiver('',0,$question,$course,$policy);
+ my ($typestyle,%to)=&Apache::lonmsg::decide_receiver('',0,$question,
+ $course,$policy);
return scalar(%to);
}
sub send_msg {
- my ($title,$feedurl,$email,$citations,$attachmenturl,%to)=@_;
+ my ($title,$feedurl,$email,$citations,$attachmenturl,$symb,%to)=@_;
my $status='';
my $sendsomething=0;
+ my $restitle = &get_resource_title($symb,$feedurl);
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(/\:/,$_),
- $title.' ['.$declutter.']',$email,$citations,$feedurl,
- $attachmenturl)=~/ok/) {
- $status.='<br />'.&mt('Error sending message to').' '.$_.'<br />';
+ foreach my $key (keys(%to)) {
+ if ($key) {
+ unless (&Apache::lonmsg::user_normal_msg(split(/\:/,$key),
+ $title.' ['.$restitle.']',$email,$citations,$feedurl,
+ $attachmenturl,undef,undef,$symb,$restitle)=~/ok/) {
+ $status.='<br />'.&mt('Error sending message to').' '.$key.'<br />';
} else {
$sendsomething++;
}
@@ -2485,7 +2694,7 @@ sub send_msg {
}
my %record=&Apache::lonnet::restore('_feedback');
- my ($temp)=keys %record;
+ my ($temp)=keys(%record);
unless ($temp=~/^error\:/) {
my %newrecord=();
$newrecord{'resource'}=$feedurl;
@@ -2528,10 +2737,11 @@ sub adddiscuss {
$contrib{'anonymous'}='true';
}
if (($symb) && ($email)) {
+ my $now = time;
if ($env{'form.editdisc'}) {
$contrib{'ip'}=$ENV{'REMOTE_ADDR'};
$contrib{'host'}=$Apache::lonnet::perlvar{'lonHostID'};
- $contrib{'timestamp'} = time;
+ $contrib{'timestamp'} = $now;
$contrib{'history'} = '';
my $numoldver = 0;
my ($oldsymb,$oldidx)=split(/\:\:\:/,$env{'form.editdisc'});
@@ -2546,7 +2756,7 @@ sub adddiscuss {
}
if (defined($oldcontrib{$oldidx.':history'})) {
if ($oldcontrib{$oldidx.':history'} =~ /:/) {
- my @oldversions = split/:/,$oldcontrib{$oldidx.':history'};
+ my @oldversions = split(/:/,$oldcontrib{$oldidx.':history'});
$numoldver = @oldversions;
} else {
$numoldver = 1;
@@ -2582,14 +2792,14 @@ sub adddiscuss {
$env{'course.'.$env{'request.course.id'}.'.domain'},
$env{'course.'.$env{'request.course.id'}.'.num'});
}
- my %storenewentry=($symb => time);
+ my %storenewentry=($symb => $now);
$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'});
}
my %record=&Apache::lonnet::restore('_discussion');
- my ($temp)=keys %record;
+ my ($temp)=keys(%record);
unless ($temp=~/^error\:/) {
my %newrecord=();
$newrecord{'resource'}=$symb;
@@ -2603,27 +2813,70 @@ sub adddiscuss {
return $status.'<br />';
}
+sub get_discussion_info {
+ my ($idx,%contrib) = @_;
+ my $changelast = 0;
+ my $count = 0;
+ my $hiddenflag = 0;
+ my $deletedflag = 0;
+ my ($hidden,$deleted,%info,$newlastdisc);
+ my $version = $contrib{'version'};
+ if ($version) {
+ for (my $id=$version; $id>0; $id--) {
+ my $vkeys=$contrib{$id.':keys'};
+ my @keys=split(/:/,$vkeys);
+ if (grep(/^hidden$/,@keys)) {
+ if (!$hiddenflag) {
+ $hidden = $contrib{$id.':hidden'};
+ $hiddenflag = 1;
+ }
+ } elsif (grep(/^deleted$/,@keys)) {
+ if (!$deletedflag) {
+ $deleted = $contrib{$id.':deleted'};
+ $deletedflag = 1;
+ }
+ } else {
+ if (($hidden !~/\.$id\./) && ($deleted !~/\.$id\./)) {
+ $count++;
+ $info{$count}{'id'} = $id;
+ $info{$count}{'timestamp'}=$contrib{$id.':timestamp'};
+ }
+ }
+ }
+ if ($info{'1'}{'id'} == $idx) {
+ $changelast = 1;
+ if ($count > 1) {
+ $newlastdisc = $info{'2'}{'timestamp'};
+ } else {
+ $newlastdisc = 0;
+ }
+ }
+ }
+ return ($changelast,$newlastdisc);
+}
+
# ----------------------------------------------------------- Preview function
sub show_preview {
my ($r) = @_;
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
+ my $start_page=
+ &Apache::loncommon::start_page('Preview',undef,
+ {'only_body' => 1,});
+
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 $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 />'.
+ '<b>'.&mt('Subject').':</b> '.$subject.'<br /><br />'.
$message.'</td></tr></table>'.$end_page);
}
@@ -2655,6 +2908,7 @@ sub generate_preview_button {
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" />
@@ -2666,8 +2920,29 @@ 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 %lt = &Apache::lonlocal::texthash(
+ 'subj' => 'Subject',
+ 'thfo' => 'The following attachments were part of the most recent saved version of this posting.',
+ 'chth' => 'Check the checkboxes for any you wish to remove.',
+ 'thef' => 'The following attachments have been uploaded for inclusion with this posting.',
+ 'adda' => 'Add a new attachment to this post.',
+ 'stch' => 'Store Changes',
+ );
+ my $js = <<END;
+<script type="text/javascript">
+ function setAction () {
+ document.modattachments.action = document.modattachments.origpage.value;
+ document.modattachments.submit();
+ }
+</script>
+END
+
+ my $start_page =
+ &Apache::loncommon::start_page('Discussion Post Attachments',$js);
+
+ 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'};
@@ -2680,21 +2955,12 @@ sub modify_attachments {
&extract_attachments($attachmenturls,$idx,$numoldver,\$msg,\%attachments,\%currattach,$currdelold);
}
&Apache::lonenc::check_encrypt(\$symb);
- my $js = <<END;
-<script type="text/javascript">
- function setAction () {
- document.modattachments.action = document.modattachments.origpage.value;
- document.modattachments.submit();
- }
-</script>
-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>
@@ -2703,9 +2969,9 @@ END
END
if ($idx) {
if ($attachmenturls) {
- my @currold = keys %currattach;
+ my @currold = keys(%currattach);
if (@currold > 0) {
- $r->print("The following attachments were part of the most recent saved version of this posting.<br />Check the checkboxes for any you wish to remove<br />\n");
+ $r->print($lt{'thfo'}.'<br />'.$lt{'chth'}.'<br />'."\n");
foreach my $id (@currold) {
my $attachurl = &HTML::Entities::decode($attachments{$id}{'filename'});
$attachurl =~ m#/([^/]+)$#;
@@ -2715,16 +2981,16 @@ END
}
}
}
- if (@{$currnewattach} > 0) {
- $r->print("The following attachments have been uploaded for inclusion with this posting.<br />Check the checkboxes for any you wish to remove<br />\n");
- foreach (@{$currnewattach}) {
- $_ =~ m#/([^/]+)$#;
- $r->print('<label><input type="checkbox" name="delnewattach" value="'.$_.'" /> '.$1.'</label><br />'."\n");
+ if ((ref($currnewattach) eq 'ARRAY') && (@{$currnewattach} > 0)) {
+ $r->print($lt{'thef'}.'<br />'.$lt{'chth'}.'<br />'."\n");
+ foreach my $attach (@{$currnewattach}) {
+ $attach =~ m#/([^/]+)$#;
+ $r->print('<label><input type="checkbox" name="delnewattach" value="'.$attach.'" /> '.$1.'</label><br />'."\n");
}
$r->print("<br />");
}
$r->print(<<END);
- Add a new attachment to this post. <input type="file" name="addnewattach" /><input type="button" name="upload" value="Upload" onClick="this.form.submit()" />
+ $lt{'adda'} <input type="file" name="addnewattach" /><input type="button" name="upload" value="Upload" onClick="this.form.submit()" />
</td>
</tr>
</table>
@@ -2734,18 +3000,17 @@ 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}) {
- $r->print('<input type="hidden" name="currnewattach" value="'.$_.'" />'."\n");
+ foreach my $item (@{$currnewattach}) {
+ $r->print('<input type="hidden" name="currnewattach" value="'.$item.'" />'."\n");
}
- foreach (@{$currdelold}) {
- $r->print('<input type="hidden" name="deloldattach" value="'.$_.'" />'."\n");
+ foreach my $item (@{$currdelold}) {
+ $r->print('<input type="hidden" name="deloldattach" value="'.$item.'" />'."\n");
}
$r->print(<<END);
- <input type="button" name="rtntoedit" value="Store Changes" onClick="setAction()"/>
+ <input type="button" name="rtntoedit" value="$lt{'stch'}" onClick="setAction()"/>
</form>
$end_page
END
@@ -2765,14 +3030,14 @@ sub process_attachments {
my @currnew = ();
foreach my $newone (@{$currnewattach}) {
my $delflag = 0;
- foreach (@currdelnew) {
- if ($newone eq $_) {
+ foreach my $item (@currdelnew) {
+ if ($newone eq $item) {
$delflag = 1;
last;
}
}
unless ($delflag) {
- push @currnew, $newone;
+ push(@currnew, $newone);
}
}
@{$currnewattach} = @currnew;
@@ -2781,14 +3046,22 @@ sub process_attachments {
}
sub generate_attachments_button {
- my ($idx,$attachnum,$ressymb,$now,$currnewattach,$deloldattach,$numoldver,$mode) = @_;
+ my ($idx,$attachnum,$ressymb,$now,$currnewattach,$deloldattach,
+ $numoldver,$mode,$blockblog) = @_;
my $origpage = $ENV{'REQUEST_URI'};
my $att=$attachnum.' '.&mt("attachments");
+ my %lt = &Apache::lonlocal::texthash(
+ 'clic' => 'Click to add/remove 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"
+$lt{'clic'}: <input type="button" value="$att"
onClick="if (typeof(document.mailform.onsubmit)=='function') {document.mailform.onsubmit();};this.form.comment.value=escape(document.mailform.comment.value);this.form.subject.value=escape(document.mailform.subject.value);
END
+ if (!$blockblog) {
+ $response .= 'setblogvalue();';
+ }
unless ($mode eq 'board') {
$response .= 'javascript:anonchk();';
}
@@ -2800,21 +3073,20 @@ this.form.submit();" />
<input type="hidden" name="subject" />
<input type="hidden" name="comment" />
<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)) {
if (@{$deloldattach} > 0) {
- foreach (@{$deloldattach}) {
- $response .= '<input type="hidden" name="deloldattach" value="'.$_.'" />'."\n";
+ foreach my $delatt (@{$deloldattach}) {
+ $response .= '<input type="hidden" name="deloldattach" value="'.$delatt.'" />'."\n";
}
}
}
if (defined($currnewattach)) {
if (@{$currnewattach} > 0) {
- foreach (@{$currnewattach}) {
- $response .= '<input type="hidden" name="currnewattach" value="'.$_.'" />'."\n";
+ foreach my $attach (@{$currnewattach}) {
+ $response .= '<input type="hidden" name="currnewattach" value="'.$attach.'" />'."\n";
}
}
}
@@ -2826,7 +3098,7 @@ sub extract_attachments {
my ($attachmenturls,$idx,$numoldver,$message,$attachments,$currattach,$currdelold) = @_;
%{$attachments}=();
&get_post_attachments($attachments,$attachmenturls);
- foreach my $id (sort keys %{$attachments}) {
+ foreach my $id (sort(keys(%{$attachments}))) {
if (exists($$attachments{$id}{$numoldver})) {
if (defined($currdelold)) {
if (@{$currdelold} > 0) {
@@ -2841,7 +3113,7 @@ sub extract_attachments {
}
}
}
- my @attached = (sort { $a <=> $b } keys %{$currattach});
+ my @attached = (sort { $a <=> $b } keys(%{$currattach}));
if (@attached == 1) {
my $id = $attached[0];
my $attachurl;
@@ -2857,8 +3129,8 @@ sub extract_attachments {
$attachurl);
} elsif (@attached > 1) {
$$message.='<ol>';
- foreach (@attached) {
- my $id = $_;
+ foreach my $attach (@attached) {
+ my $id = $attach;
my $attachurl = &HTML::Entities::decode($$attachments{$id}{'filename'});
my ($fname)
=($attachurl=~m|/([^/]+)$|);
@@ -2885,7 +3157,7 @@ sub construct_attachmenturl {
$oldattachmenturl = $contrib{$idx.':attachmenturl'};
if ($contrib{$idx.':history'}) {
if ($contrib{$idx.':history'} =~ /:/) {
- my @oldversions = split/:/,$contrib{$idx.':history'};
+ my @oldversions = split(/:/,$contrib{$idx.':history'});
$currver = 1 + scalar(@oldversions);
} else {
$currver = 2;
@@ -2898,13 +3170,13 @@ sub construct_attachmenturl {
my %attachments = ();
my $prevver = $currver-1;
&get_post_attachments(\%attachments,$oldattachmenturl);
- my $numattach = scalar(keys %attachments);
+ my $numattach = scalar(keys(%attachments));
$startnum += $numattach;
- foreach my $num (sort {$a <=> $b} keys %attachments) {
+ foreach my $num (sort {$a <=> $b} keys(%attachments)) {
$newattachmenturl .= '<attachment id="'.$num.'"><filename>'.$attachments{$num}{'filename'}.'</filename>';
- foreach $_ (sort {$a <=> $b} keys %{$attachments{$num}}) {
- unless ($_ eq 'filename') {
- $newattachmenturl .= '<post id="'.$_.'">'.$attachments{$num}{$_}.'</post>';
+ foreach my $item (sort {$a <=> $b} keys(%{$attachments{$num}})) {
+ unless ($item eq 'filename') {
+ $newattachmenturl .= '<post id="'.$item.'">'.$attachments{$num}{$item}.'</post>';
}
}
if (grep/^$num$/,@{$keepold}) {
@@ -2929,6 +3201,26 @@ sub construct_attachmenturl {
return $newattachmenturl;
}
+sub add_blog_checkbox {
+ my ($checkstatus);
+ if ($env{'form.blog'}) {
+ $checkstatus = 'checked="checked"';
+ }
+ my $output = '
+<script type="text/javascript">
+function setblogvalue() {
+ if (document.mailform.blog.checked) {
+ document.attachment.blog.value = 1;
+ } else {
+ document.attachment.blog.value = 0;
+ }
+}
+</script><br />
+<label><input type="checkbox" name="blog" '.$checkstatus.' /> '.
+&mt('Add to my public course blog').'</label><br />'."\n";
+ return $output;
+}
+
sub has_discussion {
my $resourcesref = shift;
my $navmap = Apache::lonnavmaps::navmap->new();
@@ -2936,7 +3228,7 @@ sub has_discussion {
foreach my $resource (@allres) {
if ($resource->hasDiscussion()) {
my $ressymb = $resource->wrap_symb();
- push @{$resourcesref}, $ressymb;
+ push(@{$resourcesref}, $ressymb);
}
}
return;
@@ -2964,8 +3256,9 @@ sub sort_filter_names {
);
%{$status_types} = (
all => 'Roles of any status',
- Active => 'Only active roles',
- Expired => 'Only inactive roles'
+ Active => 'Only active roles',
+ Expired => 'Only past roles',
+ Future => 'Only future roles',
);
}
@@ -2980,13 +3273,15 @@ 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','sendmessageonly']);
+ ['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','groupick','posterlist','userpick','attach','origpage','currnewattach','deloldattach','keepold','allversions','export','sendmessageonly','group','ref']);
+ my $group = $env{'form.group'};
if ($env{'form.editdisc'}) {
- if (!(&editing_allowed())) {
+ if (!(&editing_allowed($env{'form.editdisc'},$env{'form.group'}))) {
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'},'','','',);
+ &redirect_back($r,$feedurl,&mt('Editing not permitted').'<br />', '0','0','','',$env{'form.previous'},undef,undef,undef,
+ undef,undef,undef,$group);
return OK;
}
}
@@ -2995,7 +3290,7 @@ sub handler {
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) {
+ foreach my $key (keys(%env)) {
if ($key =~ m/^form\.postunread_(\d+)/) {
if ($readinghash{$readkey} =~ /\.$1\./) {
$readinghash{$readkey} =~ s/\.$1\.//;
@@ -3013,7 +3308,8 @@ 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'},'','','',
+ undef,undef,undef,$group);
return OK;
}
if ($env{'form.allversions'}) {
@@ -3028,9 +3324,20 @@ sub handler {
$crs.='_'.$env{'request.course.sec'};
}
$crs=~s|_|/|g;
- my $seeid=&Apache::lonnet::allowed('rin',$crs);
+ my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+ my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
my ($symb,$idx)=split(/\:\:\:/,$env{'form.allversions'});
($symb)=&get_feedurl_and_clean_symb($symb);
+ my $ressymb = &wrap_symb($symb);
+ my $group = $env{'form.group'};
+ my $seeid;
+ if (($group ne '') && (($ressymb =~ m|^bulletin___\d+___adm/wrapper/adm/\Q$cdom\E/\Q$cnum\E/\d+/bulletinboard$|))) {
+ if (&check_group_priv($group,'dgp') eq 'ok') {
+ $seeid = 1;
+ }
+ } else {
+ $seeid = &Apache::lonnet::allowed('rin',$crs);
+ }
if ($idx > 0) {
my %messages = ();
my %subjects = ();
@@ -3062,7 +3369,7 @@ sub handler {
\%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);
+ '',$numpicks,$group);
return OK;
}
if ($env{'form.applysort'}) {
@@ -3070,7 +3377,8 @@ sub handler {
&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'});
+ $env{'form.sectionpick'},$env{'form.grouppick'},
+ undef,$group);
return OK;
} elsif ($env{'form.cmd'} eq 'sortfilter') {
my ($symb,$feedurl)=&get_feedurl_and_clean_symb($env{'form.symb'});
@@ -3081,7 +3389,7 @@ sub handler {
my @resources = ();
if (defined($env{'form.navmaps'})) {
if ($env{'form.navmaps'} =~ /:/) {
- @resources = split/:/,$env{'form.navmaps'};
+ @resources = split(/:/,$env{'form.navmaps'});
} else {
@resources = ("$env{'form.navmaps'}");
}
@@ -3096,8 +3404,8 @@ sub handler {
'robb' => 'resources/bulletin boards.',
'twnp' => 'There are currently no resources or bulletin boards with unread discussion postings.'
);
- foreach (@resources) {
- my $ressymb=$_;
+ foreach my $res (@resources) {
+ my $ressymb=$res;
&Apache::lonenc::check_decrypt(\$ressymb);
my $lastkey = $ressymb.'_lastread';
$discinfo{$lastkey} = $env{'form.navtime'};
@@ -3112,7 +3420,12 @@ sub handler {
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
my $logo=&Apache::loncommon::lonhttpdurl('/adm/lonIcons/lonlogos.gif');
- my %onload = ('onload' => "if (window.name!='loncapaclient') { this.document.reldt.submit(); self.window.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],
@@ -3170,7 +3483,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,'','','','','','',$group);
return OK;
} elsif (($env{'form.hide'}) || ($env{'form.unhide'})) {
# ----------------------------------------------------------------- Hide/unhide
@@ -3185,8 +3498,9 @@ ENDREDIR
$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'},'','','',);
+ if ($env{'form.hide'} && !$seeid && !(&editing_allowed($env{'form.hide'},$env{'form.group'}))) {
+ &redirect_back($r,$feedurl,&mt('Deletion not permitted').'<br />', '0','0','','',$env{'form.previous'},'','','','',
+ undef,undef,$group,);
return OK;
}
@@ -3209,13 +3523,23 @@ ENDREDIR
if ( ($env{'form.hide'}) && (!$seeid) ) {
$newhash{'studenthidden'} = $currentstudenthidden;
}
-
+ if ($env{'form.hide'}) {
+ my $changelast = 0;
+ my $newlast;
+ ($changelast,$newlast) = &get_discussion_info($idx,%contrib);
+ if ($changelast) {
+ &Apache::lonnet::put('discussiontimes',{$symb => $newlast},
+ $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'},undef,undef,undef,
+ undef,undef,undef,$group);
return OK;
} elsif ($env{'form.cmd'}=~/^(threadedoff|threadedon)$/) {
my ($symb,$feedurl)=&get_feedurl_and_clean_symb($env{'form.symb'});
@@ -3227,7 +3551,8 @@ 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'},undef,undef,undef,
+ undef,undef,undef,$group);
return OK;
} elsif ($env{'form.deldisc'}) {
# --------------------------------------------------------------- Hide for good
@@ -3236,12 +3561,18 @@ ENDREDIR
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 ($changelast,$newlast) = &get_discussion_info($idx,%contrib);
+ if ($changelast) {
+ &Apache::lonnet::put('discussiontimes',{$symb => $newlast},
+ $env{'course.'.$env{'request.course.id'}.'.domain'}, $env{'course.'.$env{'request.course.id'}.'.num'});
+ }
my %newhash=('deleted' => $contrib{'deleted'}.".$idx.");
&Apache::lonnet::store(\%newhash,$symb,$env{'request.course.id'},
$env{'course.'.$env{'request.course.id'}.'.domain'},
$env{'course.'.$env{'request.course.id'}.'.num'});
&redirect_back($r,$feedurl,&mt('Changed discussion status').'<br />',
- '0','0','','',$env{'form.previous'});
+ '0','0','','',$env{'form.previous'},undef,undef,undef,
+ undef,undef,undef,$group);
return OK;
} elsif ($env{'form.preview'}) {
# -------------------------------------------------------- User wants a preview
@@ -3251,14 +3582,14 @@ 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','blog']);
+ &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'})) {
unless (length($env{'form.addnewattach'})>131072) {
my $subdir = 'feedback/'.$env{'form.timestamp'};
my $newattachment=&Apache::lonnet::userfileupload('addnewattach',undef,$subdir);
- push @currnewattach, $newattachment;
+ push(@currnewattach, $newattachment);
}
}
my $attachmenturls;
@@ -3302,12 +3633,8 @@ ENDREDIR
my $symb;
if ($env{'form.replydisc'}) {
$symb=(split(/\:\:\:/,$env{'form.replydisc'}))[0];
- my ($map,$id,$url)=&Apache::lonnet::decode_symb($symb);
- $feedurl=&Apache::lonnet::clutter($url);
} elsif ($env{'form.editdisc'}) {
$symb=(split(/\:\:\:/,$env{'form.editdisc'}))[0];
- my ($map,$id,$url)=&Apache::lonnet::decode_symb($symb);
- $feedurl=&Apache::lonnet::clutter($url);
} elsif ($env{'form.origpage'}) {
$symb="";
} else {
@@ -3315,18 +3642,18 @@ ENDREDIR
}
unless ($symb) {
$symb=$env{'form.symb'};
- if ($symb) {
- my ($map,$id,$url)=&Apache::lonnet::decode_symb($symb);
- $feedurl=&Apache::lonnet::clutter($url);
- }
}
- &Apache::lonenc::check_decrypt(\$symb);
+ if (defined($symb)) {
+ ($symb,$feedurl)=&get_feedurl_and_clean_symb($symb);
+ } else {
+ # backward compatibility (bulletin boards used to be 'wrapped')
+ &Apache::lonenc::check_decrypt(\$feedurl);
+ &dewrapper(\$feedurl);
+ }
my $goahead=1;
if ($feedurl=~/\.(problem|exam|quiz|assess|survey|form|task)$/) {
unless ($symb) { $goahead=0; }
}
- # backward compatibility (bulletin boards used to be 'wrapped')
- &dewrapper(\$feedurl);
if (!$goahead) {
# Ambiguous Problem Resource
$r->internal_redirect('/adm/ambiguous');
@@ -3345,16 +3672,26 @@ ENDREDIR
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
# Unable to give feedback
+ &Apache::lonenc::check_encrypt(\$feedurl);
&no_redirect_back($r,$feedurl);
return OK;
}
# --------------------------------------------------- Print login screen header
unless ($env{'form.sendit'}) {
+ &Apache::lonenc::check_encrypt(\$feedurl);
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
+ if (($env{'form.replydisc'}) || ($env{'form.editdisc'})) {
+ my ($blocked,$blocktext) =
+ &Apache::loncommon::blocking_status('boards');
+ if ($blocked) {
+ $r->print(&blocked_reply_or_edit($blocktext));
+ return OK;
+ }
+ }
my $options=&screen_header($feedurl,$symb);
if ($options) {
- &mail_screen($r,$feedurl,$options);
+ &mail_screen($r,$feedurl,$options,$symb);
} else {
&fail_redirect($r,$feedurl);
}
@@ -3367,13 +3704,16 @@ ENDREDIR
$env{'request.course.id'});
# Get output from resource
+ &Apache::lonenc::check_encrypt(\$feedurl);
my $usersaw=&resource_output($feedurl);
# 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'});
+ my $usersymb = &Apache::lonenc::check_encrypt($symb);
+ my $useranswer=
+ &Apache::loncommon::get_student_answers(
+ $usersymb,$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='';
@@ -3403,22 +3743,25 @@ ENDREDIR
my $message=&clear_out_html($env{'form.comment'});
# Assemble email
- my ($email,$citations)=&assemble_email($feedurl,$message,$prevattempts,
+ my ($email,$citations)=&assemble_email($message,$prevattempts,
$usersaw,$useranswer);
# Who gets this?
- my ($typestyle,%to) = &decide_receiver($feedurl);
+ my ($typestyle,%to) = &Apache::lonmsg::decide_receiver($feedurl);
# Actually send mail
- my ($status,$numsent)=&send_msg(&clear_out_html($env{'form.subject'}),$feedurl,$email,$citations,
- $attachmenturl,%to);
+ my ($status,$numsent)=&send_msg(&clear_out_html($env{'form.subject'},
+ undef,1),
+ $feedurl,$email,$citations,
+ $attachmenturl,$usersymb,%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'} ne ''
+ && $env{'form.discuss'} !~ /^(?:author|question|course|policy)/)
+ || $env{'form.anondiscuss'} ne '') {
+ 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++;
@@ -3428,7 +3771,7 @@ ENDREDIR
my $blog='';
if ($env{'form.blog'}) {
- my $subject = &clear_out_html($env{'form.subject'});
+ 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'},
@@ -3437,9 +3780,18 @@ ENDREDIR
}
# Receipt screen and redirect back to where came from
- &redirect_back($r,$feedurl,$typestyle,$numsent,$numpost,$blog,$status,$env{'form.previous'});
+ &redirect_back($r,$feedurl,$typestyle,$numsent,$numpost,$blog,$status,$env{'form.previous'},undef,undef,undef,undef,undef,undef,$group);
}
return OK;
+}
+
+sub blocked_reply_or_edit {
+ my ($blocktext) = @_;
+ return
+ &Apache::loncommon::start_page('Resource Feedback and Discussion').
+ $blocktext.'<br /><br /><a href="javascript:history.go(-1)">'.
+ &mt('Back to previous page').
+ &Apache::loncommon::end_page();
}
sub wrap_symb {
@@ -3478,7 +3830,19 @@ sub get_feedurl_and_clean_symb {
}
sub editing_allowed {
+ my ($postid,$group) = @_;
+ $postid = &unescape($postid);
my $can_edit = 0;
+ if ($group ne '') {
+ my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+ my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+ if ($postid =~ m|^bulletin___\d+___adm/wrapper(/adm/\Q$cdom\E/\Q$cnum\E/\d+/bulletinboard)|) {
+ if (&check_group_priv($group,'egp') eq 'ok') {
+ $can_edit = 1;
+ }
+ return $can_edit;
+ }
+ }
my $cid = $env{'request.course.id'};
my $role = (split(/\./,$env{'request.role'}))[0];
my $section = $env{'request.course.sec'};
@@ -3505,5 +3869,59 @@ sub editing_allowed {
return $can_edit;
}
+sub check_group_priv {
+ my ($group,$grp_priv) = @_;
+ foreach my $priv ('mdg','vcg') {
+ my $checkcourse = $env{'request.course.id'}.
+ ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:'');
+ if (&Apache::lonnet::allowed($priv,$checkcourse)) {
+ return 'ok';
+ }
+ }
+ if ($grp_priv && $group ne '') {
+ if (&Apache::lonnet::allowed($grp_priv,$env{'request.course.id'}.'/'.$group)) {
+ return 'ok';
+ }
+ }
+ return '';
+}
+
+sub group_args {
+ my ($group) = @_;
+ if ($group eq '') { return ''; }
+ my $extra_args = '&group='.$group;
+ if (exists($env{'form.ref'})) {
+ $extra_args .= '&ref='.$env{'form.ref'};
+ }
+ return $extra_args;
+}
+
+sub get_resource_title {
+ my ($symb,$feedurl) = @_;
+ my ($restitle,$plainurl);
+ if (defined($symb)) {
+ my $plain_symb = &Apache::lonenc::check_decrypt($symb);
+ $restitle = &Apache::lonnet::gettitle($plain_symb);
+ }
+ if (defined($feedurl)) {
+ $plainurl = &Apache::lonenc::check_decrypt($feedurl);
+ }
+ if (!defined($restitle)) {
+ if (defined($feedurl)) {
+ $restitle = &Apache::lonnet::gettitle($plainurl);
+ }
+ }
+ if ($plainurl ne $feedurl) {
+ my ($plain_filename) = ($plainurl =~ m-/([^/]+)$-);
+ if ($plain_filename eq $restitle) {
+ $restitle = &mt('Untitled resource');
+ }
+ }
+ if ($restitle eq '') {
+ $restitle = &mt('Untitled resource');
+ }
+ return $restitle;
+}
+
1;
__END__