--- loncom/interface/lonfeedback.pm 2006/11/28 21:44:37 1.218
+++ loncom/interface/lonfeedback.pm 2006/12/05 02:55:52 1.226
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Feedback
#
-# $Id: lonfeedback.pm,v 1.218 2006/11/28 21:44:37 albertel Exp $
+# $Id: lonfeedback.pm,v 1.226 2006/12/05 02:55:52 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -44,7 +44,6 @@ use HTML::LCParser();
use Apache::lonspeller();
use Apache::longroup;
use Cwd;
-use lib '/home/httpd/lib/perl/';
use LONCAPA;
sub discussion_open {
@@ -92,6 +91,12 @@ sub list_discussion {
return '';
}
}
+
+ my ($blocked,$blocktext) = &blocking_posts('boards',1);
+ if ($blocked) {
+ return $blocktext;
+ }
+
my @bgcols = ("#cccccc","#eeeeee");
my $discussiononly=0;
if ($mode eq 'board') { $discussiononly=1; }
@@ -132,7 +137,7 @@ 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','grouppick','totposters']);
@@ -161,19 +166,19 @@ sub list_discussion {
my ($classgroups,$studentgroups);
if ($env{'form.rolefilter'}) {
%roleshash = &Apache::lonnet::dump('nohist_userroles',$cdom,$cnum);
- foreach (keys %roleshash) {
- my ($role,$uname,$udom,$sec) = split/:/,$_;
+ 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,$keylist) =
@@ -183,7 +188,7 @@ sub list_discussion {
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,
@@ -290,6 +295,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'};
@@ -384,77 +396,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=&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>';
-
- 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.'">'.
@@ -477,39 +452,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>';
@@ -518,52 +493,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>';
}
}
@@ -618,7 +593,6 @@ END
$discussion .= &mt('Posts by').':';
if ($totposters > 0) {
foreach my $poster (@posters) {
- $poster =~ s/:/\@/;
$discussion .= ' '.$poster.',';
}
$discussion =~ s/,$//;
@@ -637,8 +611,8 @@ END
}
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 />     ';
@@ -665,9 +639,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) {
@@ -699,13 +677,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;
}
@@ -764,19 +742,97 @@ END
return $discussion;
}
+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 blocking_posts {
+ my ($type,$showstatus) = @_;
+ my %setters;
+ my ($blocked,$output);
+ my ($startblock,$endblock) =
+ &Apache::loncommon::blockcheck(\%setters,$type);
+ if ($startblock && $endblock) {
+ $blocked = 1;
+ if ($showstatus) {
+ my $showstart = &Apache::lonlocal::locallocaltime($startblock);
+ my $showend = &Apache::lonlocal::locallocaltime($endblock);
+ $output = &mt('Discussion postings will not be viewable for resources in this course between [_1] and [_2] because communication is being blocked.',$showstart, $showend).'<br />'.
+ &Apache::loncommon::build_block_table($startblock,$endblock,
+ \%setters);
+ }
+ }
+ return ($blocked,$output);
+}
+
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="Post Discussion" />
-<input type="submit" name="anondiscuss" value="Post Anonymous Discussion" /> <input type="hidden" name="symb" value="$ressymb" />
+<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">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 />
+<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'}) {
@@ -794,13 +850,18 @@ ENDDISCUSS
if ($group ne '') {
$postingform .='<input type="hidden" name="group" value="'.$group.'" />';
}
+ my ($blockblog) = &blocking_posts('blogs');
+ if (!$blockblog) {
+ $postingform .= &add_blog_checkbox();
+ }
$postingform .= "</form>\n";
if ($outputtarget ne 'tex') {
$postingform .= &generate_attachments_button('',$attachnum,$ressymb,
$now,$currnewattach,
- $currdelold,'',$mode);
+ $currdelold,'',$mode,
+ $blockblog);
if ((ref($currnewattach) eq 'ARRAY') && (@{$currnewattach} > 0)) {
- $newattachmsg = '<br /><b>New attachments</b><br />';
+ $newattachmsg = '<br /><b>'.$lt{'newa'}.'</b><br />';
if (@{$currnewattach} > 1) {
$newattachmsg .= '<ol>';
foreach my $item (@{$currnewattach}) {
@@ -880,7 +941,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;
@@ -919,13 +980,13 @@ 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");
}
@@ -947,7 +1008,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");
}
@@ -967,7 +1028,7 @@ 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");
}
@@ -982,7 +1043,8 @@ sub build_posting_display {
$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>';
}
}
@@ -1005,14 +1067,11 @@ sub build_posting_display {
}
$sender .= &group_args($group);
$sender .= '">'.&mt('Hide').'</a>';
- }
- $sender.=' <a href="/adm/feedback?deldisc='.
- $escsymb.':::'.$idx;
- if ($$newpostsflag) {
- $sender .= '&previous='.$prevread;
- }
- $sender .= &group_args($group);
- $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) {
@@ -1025,7 +1084,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");
}
@@ -1034,7 +1093,7 @@ 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");
}
@@ -1194,7 +1253,7 @@ sub build_posting_display {
}
$$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'}");
}
@@ -1217,9 +1276,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) {
@@ -1237,9 +1296,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)) {
@@ -1301,7 +1360,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);
@@ -1328,9 +1387,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 />';
@@ -1339,7 +1398,7 @@ sub get_post_contents {
}
} else {
if ($attachmsg) {
- $$attachtxt{$i} = '<br />Attachments:'.$attachmsg.'<br />';
+ $$attachtxt{$i} = '<br />'.&mt('Attachments').':'.$attachmsg.'<br />';
} else {
$$attachtxt{$i} = '';
}
@@ -1363,11 +1422,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;
@@ -1386,11 +1445,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";
}
}
}
@@ -1404,6 +1463,13 @@ sub mail_screen {
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['subject','comment','currnewattach','addnewattach','deloldattach','delnewattach','timestamp','idx','anondiscuss','discuss','blog','group','ref']);
}
+ 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 $title=&Apache::lonnet::gettitle($feedurl);
if (!$title) { $title = $feedurl; }
my $quote='';
@@ -1471,7 +1537,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;
@@ -1480,7 +1546,7 @@ 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;
@@ -1494,7 +1560,7 @@ END
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 {
@@ -1541,6 +1607,7 @@ END
}
my $latexHelp=&Apache::loncommon::helpLatexCheatsheet();
my $send=&mt('Send');
+ my $alert = &mt('Please select a feedback type.');
my $js= <<END;
<script type="text/javascript">
//<!--
@@ -1571,7 +1638,7 @@ END
}
document.mailform.submit();
} else {
- alert('Please select a feedback type.');
+ alert('$alert');
}
}
$anonchk
@@ -1609,13 +1676,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>
@@ -1623,25 +1690,25 @@ 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
}
@@ -1668,10 +1735,11 @@ END
if (@currnewattach > 0) {
$attachnum += @currnewattach;
}
- $r->print(&generate_attachments_button($postidx,$attachnum,$ressymb,$now,\@currnewattach,\@currdelold,$numoldver));
+ my ($blockblog) = &blocking_posts('blogs');
+ $r->print(&generate_attachments_button($postidx,$attachnum,$ressymb,$now,\@currnewattach,\@currdelold,$numoldver,'',$blockblog));
if ($attachnum > 0) {
if (@currnewattach > 0) {
- $newattachmsg .= '<br /><b>New attachments</b><br />';
+ $newattachmsg .= '<br /><b>'.&mt('New attachments').'</b><br />';
if (@currnewattach > 1) {
$newattachmsg .= '<ol>';
foreach my $item (@currnewattach) {
@@ -1685,7 +1753,7 @@ END
}
}
if ($attachmsg) {
- $r->print("<br /><b>Retained attachments</b>:$attachmsg<br />\n");
+ $r->print("<br /><b>$lt{'reta'}</b>:$attachmsg<br />\n");
}
if ($newattachmsg) {
$r->print("$newattachmsg<br />");
@@ -1976,7 +2044,8 @@ sub print_sortfilter_options {
'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 = ();
@@ -2098,7 +2167,7 @@ $start_page
<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'}.'" />');
@@ -2147,7 +2216,7 @@ sub print_showposters {
my %lt = &Apache::lonlocal::texthash(
sele => 'Select',
full => 'Fullname',
- usdo => 'Username/domain',
+ usdo => 'Username:domain',
post => 'Posts',
);
if ($contrib{'version'}) {
@@ -2172,7 +2241,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");
@@ -2197,19 +2266,19 @@ $start_page
</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(&Apache::loncommon::start_data_table_row().
'<td align="right">'.$count.'</td>
- <td align="center"><label><input name="stuinfo" type="checkbox" value="'.$_.'" /></td>
- <td>'.$last.', '.$first.' ('.$uname.','.$udom.')</label></td>
- <td>'.$postcounts{$_}.'</td>'.
+ <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());
}
}
@@ -2292,13 +2361,16 @@ 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());
}
@@ -2343,9 +2415,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/,$//;
@@ -2371,9 +2443,9 @@ sub redirect_back {
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/,$//;
@@ -2500,15 +2572,20 @@ sub screen_header {
&Apache::lonnet::allowed('pch',
$env{'request.course.id'}.
($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''))) {
- $discussoptions='<label><input type="radio" name="discuss" value="nonanon" checked="checked" /> '.
- &mt('Contribution to course discussion of resource');
- $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 ($blocked) = &blocking_posts('boards');
+ if (!$blocked) {
+ $discussoptions='<label><input type="radio" name="discuss" value="nonanon" checked="checked" /> '.
+ &mt('Contribution to course discussion of resource');
+ $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) = &blocking_posts('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) {
@@ -2557,16 +2634,21 @@ sub clear_out_html {
sub assemble_email {
my ($feedurl,$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);
@@ -2579,9 +2661,9 @@ sub secapply {
$rec=~s/\@/\:/g;
my ($adr,$sections)=($rec=~/^([^\(]+)\(([^\)]+)\)/);
if ($sections) {
- foreach (split(/\;/,$sections)) {
- if (($_ eq $env{'request.course.sec'}) ||
- ($defaultflag && ($_ eq '*'))) {
+ foreach my $sec (split(/\;/,$sections)) {
+ if (($sec eq $env{'request.course.sec'}) ||
+ ($defaultflag && ($sec eq '*'))) {
return $adr;
}
}
@@ -2628,33 +2710,33 @@ sub decide_receiver {
my %to=();
if ($env{'form.discuss'} eq 'author' ||$author) {
$typestyle.='Submitting as Author Feedback<br />';
- $feedurl=~/^\/res\/(\w+)\/(\w+)\//;
+ $feedurl=~{^/res/($LONAPA::domain_re)/($LONCAPA::username_re)/};
$to{$2.':'.$1}=1;
}
if ($env{'form.discuss'} eq 'question' ||$question) {
$typestyle.=&mt('Submitting as Question').'<br />';
- foreach (split(/\,/,
+ foreach my $item (split(/\,/,
$env{'course.'.$env{'request.course.id'}.'.question.email'})
) {
- my $rec=&secapply($_,$defaultflag);
+ my $rec=&secapply($item,$defaultflag);
if ($rec) { $to{$rec}=1; }
}
}
if ($env{'form.discuss'} eq 'course' ||$course) {
$typestyle.=&mt('Submitting as Comment').'<br />';
- foreach (split(/\,/,
+ foreach my $item (split(/\,/,
$env{'course.'.$env{'request.course.id'}.'.comment.email'})
) {
- my $rec=&secapply($_,$defaultflag);
+ my $rec=&secapply($item,$defaultflag);
if ($rec) { $to{$rec}=1; }
}
}
if ($env{'form.discuss'} eq 'policy' ||$policy) {
$typestyle.=&mt('Submitting as Policy Feedback').'<br />';
- foreach (split(/\,/,
+ foreach my $item (split(/\,/,
$env{'course.'.$env{'request.course.id'}.'.policy.email'})
) {
- my $rec=&secapply($_,$defaultflag);
+ my $rec=&secapply($item,$defaultflag);
if ($rec) { $to{$rec}=1; }
}
}
@@ -2677,13 +2759,13 @@ sub send_msg {
my $sendsomething=0;
if ($title=~/^Error/) { $title=&mt('Feedback').': '.$title; }
unless ($title=~/\w/) { $title=&mt('Feedback'); }
- foreach (keys %to) {
- if ($_) {
+ foreach my $key (keys(%to)) {
+ if ($key) {
my $declutter=&Apache::lonnet::declutter($feedurl);
- unless (&Apache::lonmsg::user_normal_msg(split(/\:/,$_),
+ unless (&Apache::lonmsg::user_normal_msg(split(/\:/,$key),
$title.' ['.$declutter.']',$email,$citations,$feedurl,
$attachmenturl)=~/ok/) {
- $status.='<br />'.&mt('Error sending message to').' '.$_.'<br />';
+ $status.='<br />'.&mt('Error sending message to').' '.$key.'<br />';
} else {
$sendsomething++;
}
@@ -2691,7 +2773,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;
@@ -2752,7 +2834,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;
@@ -2795,7 +2877,7 @@ sub adddiscuss {
$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;
@@ -2830,7 +2912,7 @@ sub show_preview {
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);
}
@@ -2875,6 +2957,14 @@ ENDPREVIEW
sub modify_attachments {
my ($r,$currnewattach,$currdelold,$symb,$idx,$attachmenturls)=@_;
+ 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 () {
@@ -2915,9 +3005,9 @@ $start_page
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#/([^/]+)$#;
@@ -2928,15 +3018,15 @@ END
}
}
if ((ref($currnewattach) eq 'ARRAY') && (@{$currnewattach} > 0)) {
- $r->print("The following attachments have been uploaded for inclusion with this posting.<br />Check the checkboxes for any you wish to remove<br />\n");
- foreach (@{$currnewattach}) {
- $_ =~ m#/([^/]+)$#;
- $r->print('<label><input type="checkbox" name="delnewattach" value="'.$_.'" /> '.$1.'</label><br />'."\n");
+ $r->print($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>
@@ -2949,14 +3039,14 @@ END
<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
@@ -2976,14 +3066,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;
@@ -2992,15 +3082,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();';
}
@@ -3017,15 +3114,15 @@ this.form.submit();" />
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";
}
}
}
@@ -3037,7 +3134,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) {
@@ -3052,7 +3149,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;
@@ -3068,8 +3165,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|/([^/]+)$|);
@@ -3096,7 +3193,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;
@@ -3109,13 +3206,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}) {
@@ -3140,6 +3237,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();
@@ -3147,7 +3264,7 @@ sub has_discussion {
foreach my $resource (@allres) {
if ($resource->hasDiscussion()) {
my $ressymb = $resource->wrap_symb();
- push @{$resourcesref}, $ressymb;
+ push(@{$resourcesref}, $ressymb);
}
}
return;
@@ -3209,7 +3326,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\.//;
@@ -3308,7 +3425,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'}");
}
@@ -3323,8 +3440,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'};
@@ -3494,7 +3611,7 @@ ENDREDIR
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;