]*)>/$threadinsert<\/td>/;
- $discussionitems[$alldiscussion{$post}]=~s/]+)>(Edit|Hide|Delete|Reply|Submissions)<\/a>//g;
$discussionitems[$alldiscussion{$post}]=~s/(|<\/b>|<\/a>|]+)>)//g;
$discussionitems[$alldiscussion{$post}]='\vskip 0 mm\noindent\makebox[2 cm][b]{\hrulefill} '.$discussionitems[$alldiscussion{$post}];
@@ -525,17 +555,17 @@ imscp_v1p1.xsd http://www.imsglobal.org/
print $manifestfile "\n".
'- '.
- '
'.$imsitems{$alldiscussion{$post}}{'title'}.' ';
+ ''.$imsitems{$alldiscussion{$post}}{'title'}.' ';
$imsresources .= "\n".
''."\n".
''."\n".
- $imsfiles{$alldiscussion{$post}}{$imsitems{$alldiscussion{$post}}{'currversion'}}."\n".
+ $imsfiles{$alldiscussion{$post}}{$imsitems{$alldiscussion{$post}}{'currversion'}}.' '."\n".
' ';
}
my $postingfile;
my $postingfilename = $tempexport.'/'.$postfilename;
if ($postingfile = Apache::File->new('>'.$postingfilename)) {
- print $postingfile 'Discussion Post '.
+ print $postingfile ''.&mt('Discussion Post').' '.
$imsitems{$alldiscussion{$post}}{'title'}.' '.
$imsitems{$alldiscussion{$post}}{'sender'}.
$imsitems{$alldiscussion{$post}}{'timestamp'}.''. $discussionitems[$alldiscussion{$post}].
' ';
}
@@ -556,17 +586,12 @@ imscp_v1p1.xsd http://www.imsglobal.org/
unless ($outputtarget eq 'tex' || $outputtarget eq 'export') {
my $colspan=$maxdepth+1;
$discussion .= <
-
-
+
+
+
-
-
-
-
- $lt{'cuse'} :
-
-
+
+ $lt{'cuse'} :
END
if ($newpostsflag) {
$discussion .=
@@ -583,22 +608,16 @@ END
}
}
$discussion .= <
-
-
- $lt{'chgt'} ?
-
-
+ $lt{'chgt'}
END
if ($sortposts) {
my %sort_types = ();
my %role_types = ();
my %status_types = ();
- &sort_filter_names(\%sort_types,\%role_types,\%status_types);
+ &sort_filter_names(\%sort_types,\%role_types,\%status_types,$crstype);
- $discussion .= ''.&mt('Sorted by').' : '.$sort_types{$sortposts}.''.&mt('Sorted by').' : '.$sort_types{$sortposts}.''.&mt('status').' - '.$status_types{$statusfilter};
@@ -633,15 +652,16 @@ END
if ($filterchoice) {
$discussion .= ''.&mt('Filters').' : '.$filterchoice;
}
- $discussion .= ''.
- ' ';
}
$discussion .= (< /dev/null |");
- close(OUTPUT);
- chdir $cwd;
- $discussion .= &mt('Download the zip file from [_1]Discussion Posting Archive','').' ',' ').''.
+ &mt('The following errors occurred during export:').
+ ' '.
+ &mt('Unfortunately you will not be able to retrieve an archive of the discussion posts at this time, because there was a problem creating the zip file.').'
';
}
}
} else {
- $discussion .= ''.
+ &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.').'
';
}
return $discussion;
}
@@ -715,105 +745,187 @@ END
$attachnum += @{$currnewattach};
}
}
- if (&discussion_open($status)) {
+ if ((&discussion_open($status)) && ($outputtarget ne 'tex')) {
if (($group ne '') && ($mode eq 'board')) {
- if (&check_group_priv($group,'pgd') eq 'ok') {
+ if ((&check_group_priv($group,'pgd') eq 'ok') &&
+ ($ressymb =~ m{^bulletin___\d+___adm/wrapper/adm/\Q$cdom\E/\Q$cnum\E/\d+/bulletinboard$})) {
$discussion .=
&postingform_display($mode,$ressymb,$now,$subject,
$comment,$outputtarget,$attachnum,
$currnewattach,$currdelold,
- $group);
+ $group,$crstype);
}
} else {
- $discussion.=
- &postingform_display($mode,$ressymb,$now,$subject,
- $comment,$outputtarget,$attachnum,
- $currnewattach,$currdelold);
+ if (&Apache::lonnet::allowed('pch',$env{'request.course.id'}.
+ ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''))) {
+
+ $discussion.=
+ &postingform_display($mode,$ressymb,$now,$subject,
+ $comment,$outputtarget,$attachnum,
+ $currnewattach,$currdelold,'',$crstype);
+ } else {
+ $discussion.= ''.
+ &mt('This discussion is closed.').' ';
+ }
}
}
- } else {
- $discussion.='';
+ if (!(&discussion_open($status)) && ($outputtarget ne 'tex')) {
+ $discussion.= ''.
+ &mt('This discussion is closed.').' ';
+ }
+ } elsif ($outputtarget ne 'tex') {
+ $discussion.='';
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.= &send_feedback_link($ressymb,$target).
- ''.&mt('This discussion is closed.').' ';
}
- $discussion.='
';
+ $discussion.= &send_message_link($ressymb).'';
}
return $discussion;
}
+sub can_see_hidden {
+ my ($mode,$ressymb,$feedurl,$group,$cdom,$cnum,$crs) = @_;
+ my $seehidden;
+ if ($env{'request.course.id'}) {
+ unless ($cdom ne '' && $cnum ne '') {
+ $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+ $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+ }
+ if ($crs eq '') {
+ $crs = '/'.$env{'request.course.id'};
+ if ($env{'request.course.sec'}) {
+ $crs.='_'.$env{'request.course.sec'};
+ }
+ $crs=~s{_}{/}g;
+ }
+ if ($mode eq '') {
+ $mode='board';
+ if ($feedurl =~ /$LONCAPA::assess_re/) {
+ $mode='problem';
+ }
+ }
+ if (($group ne '') && ($mode eq 'board') &&
+ ($ressymb =~ m{^bulletin___\d+\Q___adm/wrapper/adm/$cdom/$cnum/\E\d+/bulletinboard$})) {
+ if (&check_group_priv($group,'dgp') eq 'ok') {
+ $seehidden = 1;
+ }
+ } else {
+ $seehidden=&Apache::lonnet::allowed('rin',$crs);
+ }
+ }
+ return $seehidden;
+}
+
+sub discussion_link {
+ my ($ressymb,$linktext,$cmd,$item,$flag,$prev,$adds,$title)=@_;
+ my $link='/adm/feedback?inhibitmenu=yes&modal=yes&'.$cmd.'='.&escape($ressymb).':::'.$item;
+ if ($flag) { $link .= '&previous='.$prev; }
+ if ($adds) { $link .= $adds; }
+ my $width=600;
+ my $height=600;
+ if (($cmd eq 'hide') || ($cmd eq 'unhide') || ($cmd eq 'like') || ($cmd eq 'unlike')) {
+ $width=300;
+ $height=200;
+ }
+ return &Apache::loncommon::modal_link($link,$linktext,$width,$height,undef,undef,$title);
+}
+
+
sub send_feedback_link {
- my ($ressymb,$target) = @_;
- my $output = ''.
- ' '.
- ' ';
- return $output;
+ my ($ressymb) = @_;
+ return ''.
+ &discussion_link($ressymb,
+ ' ';
}
sub send_message_link {
my ($ressymb) = @_;
- my $output = ''.
- ' ';
+ my $output = ''.
+ &discussion_link($ressymb,
+ ' ';
return $output;
}
sub action_links_bar {
- my ($colspan,$ressymb,$visible,$newpostsflag,$group,$prevread,$markondisp) = @_;
- my $discussion = ''.
- '';
+ my ($colspan,$ressymb,$visible,$newpostsflag,$group,$prevread,$markondisp,
+ $seehidden) = @_;
+ my $discussion = ' '.
+ ''.
+ '';
my $escsymb=&escape($ressymb);
- if ($visible>2) {
- $discussion .= ' '.
- ' '.
' '.&mt('Chronological View').'
- '.&mt('Chronological View').' ';
+
+ my $otherviewurl='/adm/feedback?cmd=sortfilter&symb='.$escsymb.'&inhibitmenu=yes&modal=yes';
if ($newpostsflag) {
- $discussion .= '&previous='.$prevread;
+ $otherviewurl .= '&previous='.$prevread;
}
- $discussion .= &group_args($group);
- $discussion .='">'.&mt('Sorting/Filtering options').' ';
- } else {
- $discussion .= ' ';
+ $otherviewurl .= &group_args($group);
+ $discussion .= &Apache::loncommon::modal_link($otherviewurl,&mt('Other Views ...'),800,340);
+ $discussion .= ''.&mt('Export').'? ';
+ $discussion .= '">'.&mt('Export').'';
+ if ($seehidden) {
+ $discussion .= ' ';
+ $discussion .=''.&mt('Undelete all deleted entries').' ';
+ }
+ $discussion.='';
if ($newpostsflag) {
if (!$markondisp) {
- $discussion .=''.
- &mt('Preferences on what is marked as NEW').
+ &mt('My general preferences on what is marked as NEW').
' '.&mt('Mark NEW posts no longer new').' ';
+ $discussion .= '">'.&mt('Mark NEW posts no longer new').' ';
}
@@ -826,24 +938,37 @@ sub action_links_bar {
sub postingform_display {
my ($mode,$ressymb,$now,$subject,$comment,$outputtarget,$attachnum,
- $currnewattach,$currdelold,$group) = @_;
+ $currnewattach,$currdelold,$group,$crstype) = @_;
my $newattachmsg;
my %lt = &Apache::lonlocal::texthash(
- 'note' => 'Note: in anonymous discussion, your name is visible only to course faculty',
+ '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 = (< $lt{'note'} $lt{'title'}: $lt{'title'}: '.$lt{'newa'}.' ';
- foreach my $item (@{$currnewattach}) {
- $item =~ m#.*/([^/]+)$#;
- $newattachmsg .= ''.$1.' '."\n";
- } else {
- $$currnewattach[0] =~ m#.*/([^/]+)$#;
- $newattachmsg .= ''.$1.' '.$lt{'newa'}.' ';
+ foreach my $item (@{$currnewattach}) {
+ $item =~ m#.*/([^/]+)$#;
+ $newattachmsg .= ''.$1.' '."\n";
+ } else {
+ $$currnewattach[0] =~ m#.*/([^/]+)$#;
+ $newattachmsg .= ''.$1.' '.$message.' ';
if ($studenthidden) {
$message .=''.$sender.' ';
if ($contrib{$idx.':anonymous'}) {
$sender.=' ['.$$anonhash{$key}.'] '.&mt('Edit').' ';
-
- unless ($seeid) {
- my $grpargs = &group_args($group);
- $sender.=" ';
- }
+ if ($outputtarget ne 'tex') {
+# Add karma stars
+ my $karma=&userkarma($contrib{$idx.':sendername'},$contrib{$idx.':senderdomain'});
+ for (my $i=1;$i<=$karma;$i++) {
+ $sender.=' ';
}
- $sender .= '">'.&mt('Make Visible').' ';
- }
- } else {
- $sender.=' '.&mt('Hide').' ';
- }
- my $grpargs = &group_args($group);
- $sender.=
- " ";
- $sender .= &mt('Delete').' ';
+ }
+ if ($seehidden) {
+ if ($hiddens{$idx}) {
+ unless ($studenthidden) {
+ $sender.=' '.
+ &discussion_link($ressymb,&mt('Make Visible'),'unhide',$idx,$$newpostsflag,$prevread,&group_args($group));
+ }
+ } else {
+ $sender.=' '.
+ &discussion_link($ressymb,&mt('Hide'),'hide',$idx,$$newpostsflag,$prevread,&group_args($group));
+ }
+ my $grpargs = &group_args($group);
+ $sender.=
+ " ";
+ $sender .= &mt('Delete').' ';
+ }
}
- } else {
+ } else {
if ($screenname) {
$sender=''.$screenname.' ';
} else {
$sender=''.$$anonhash{$key}.' ';
}
+ $sender = ''.$sender.' ';
# Set up for sorting by domain, then username for anonymous
unless (defined($$usernamesort{'__anon'})) {
%{$$usernamesort{'__anon'}} = ();
@@ -1108,43 +1343,37 @@ sub build_posting_display {
@{$$namesort{'__anon'}{'__anon'}} = ("$idx");
}
}
- if (&discussion_open($status)) {
- if (($group ne '') &&
- (&check_group_priv($group,'pgd') eq 'ok')) {
- $sender.=' '.&mt('Reply').' ';
- } elsif (&Apache::lonnet::allowed('pch',
- $env{'request.course.id'}.
- ($env{'request.course.sec'}?'/'.
- $env{'request.course.sec'}:''))) {
- $sender.=' '.&mt('Reply').' ';
}
- }
- if ($viewgrades) {
- $vgrlink=&Apache::loncommon::submlink('Submissions',
- $contrib{$idx.':sendername'},$contrib{$idx.':senderdomain'},$ressymb);
- }
- if ($$dischash{$readkey}=~/\.$idx\./) {
- $ctlink = ''.&mt('Mark unread').'? '.&mt('Mark read').'? '.&mt('Mark unread').'? '.&mt('Mark read').'?
- NEW '.&mt('NEW').'
- ';
- }
- $$discussionitems[$idx] .= ' '.
- ''.$subject.' '.
- $sender.' '.$vgrlink.' ('.
- &Apache::lonlocal::locallocaltime($posttime).') ';
+ }
+ $$discussionitems[$idx] .= ''.$subject.' '.
+ $sender.' '.$vgrlink.' ('.
+ &Apache::lonlocal::locallocaltime($posttime).')';
if ($$dischash{$toggkey}) {
- $$discussionitems[$idx].=' '.
- $ctlink.' ';
+ $$discussionitems[$idx].=' '.$ctlink;
}
- $$discussionitems[$idx].= '
'.
- $message.' ';
+ my $thislikes=$likes{$symb.':'.$idx.':likes'};
+ my $likestyle;
+ if ($seeid || $canvote) {
+# Figure out size based on likes
+ my $class = 'zero';
+ my $thislikes=$likes{$symb.':'.$idx.':likes'};
+ if ($thislikes>$twoplus) {
+ $class = 'twoplus';
+ } elsif ($thislikes>$oneplus) {
+ $class = 'oneplus';
+ }
+ if ($thislikes<$twominus) {
+ $class = 'twominus';
+ } elsif ($thislikes<$oneminus) {
+ $class = 'oneminus';
+ }
+ $likestyle = $votestyle{$class};
+ }
+# Actually glue in the message itself
+ $$discussionitems[$idx].= ''.
+ "".
+ $message.
+ '
';
+ if ($canvote) {
+ my $ownpost;
+ if (($uname eq $env{'user.name'}) &&
+ ($udom eq $env{'user.domain'})) {
+ $ownpost = 1;
+ }
+# Put in the like and unlike buttons
+ if ($ownpost || (($hiddens{$idx}) && ($seehidden))) {
+ my $novote;
+ if ($ownpost) {
+ $novote = &mt('No voting for your own posts.');
+ } else {
+ $novote = &mt('No voting for hidden posts.');
+ }
+ &html_escape(\$novote);
+ $$discussionitems[$idx].=
+ ''.
+ ' ';
+
+ } else {
+ if ($userlikes{$idx}) {
+ $$discussionitems[$idx].=''.&mt('Display all versions').' ';
+ $$discussionitems[$idx] .= ' '.&mt('This post has been edited by the author.');
+ if ($seehidden) {
+ $$discussionitems[$idx] .= ' '.
+ &discussion_link($ressymb,&mt('Display all versions'),'allversions',$idx,$$newpostsflag,$prevread,&group_args($group));
}
$$discussionitems[$idx].=''.$version.'. - '.&Apache::lonlocal::locallocaltime($postversions[$i]).' ';
}
}
+# end of unless ($$notshown ...)
}
+# end of if ($message) ...
}
+# end of the else-branch of target being export
}
+# end of unless hidden or deleted
}
+# end of the loop over all discussion entries
}
+# end of "if there actually are any discussions
}
+# end of subroutine "build_posting_display"
}
sub filter_regexp {
@@ -1336,13 +1628,13 @@ sub filter_regexp {
sub get_post_contents {
- my ($contrib,$idx,$seeid,$type,$messages,$subjects,$allattachments,$attachtxt,$imsfiles,$screenname,$plainname,$numver) = @_;
+ my ($contrib,$idx,$seeid,$seehidden,$type,$messages,$subjects,$allattachments,$attachtxt,$imsfiles,$screenname,$plainname,$showaboutme,$numver) = @_;
my $discussion = '';
my $start=$numver;
my $end=$numver + 1;
%{$$imsfiles{$idx}}=();
if ($type eq 'allversions') {
- unless($seeid) {
+ unless($seehidden) {
$discussion=&mt('You do not have privileges to view all versions of posts.').' '.&mt('Please select a different role.');
return $discussion;
}
@@ -1354,13 +1646,20 @@ sub get_post_contents {
$$contrib{$idx.':sendername'},
$$contrib{$idx.':senderdomain'});
$$screenname=$$contrib{$idx.':screenname'};
-
- my $sender=&Apache::loncommon::aboutmewrapper(
+ $$showaboutme = &Apache::lonnet::usertools_access($$contrib{$idx.':sendername'},
+ $$contrib{$idx.':senderdomain'},
+ 'aboutme');
+ my $sender = $$plainname;
+ if ($$showaboutme) {
+ $sender = &Apache::loncommon::aboutmewrapper(
$$plainname,
$$contrib{$idx.':sendername'},
- $$contrib{$idx.':senderdomain'}).' ('.
- $$contrib{$idx.':sendername'}.' at '.
- $$contrib{$idx.':senderdomain'}.')';
+ $$contrib{$idx.':senderdomain'});
+ }
+ if ($seeid) {
+ $sender .= ' ('.$$contrib{$idx.':sendername'}.':'.
+ $$contrib{$idx.':senderdomain'}.')';
+ }
my $attachmenturls = $$contrib{$idx.':attachmenturl'};
my @postversions = ();
if ($type eq 'allversions' || $type eq 'export') {
@@ -1387,7 +1686,9 @@ sub get_post_contents {
my ($timesent,$attachmsg);
my %currattach = ();
$timesent = &Apache::lonlocal::locallocaltime($postversions[$i]);
- &newline_to_br(\$messages->{$i});
+ unless (&contains_block_html($messages->{$i})) {
+ &newline_to_br(\$messages->{$i});
+ }
$$messages{$i}=&Apache::lontexconvert::msgtexconverted($$messages{$i});
$$subjects{$i}=~s/\n/\'."\n";
+ $$imsfiles{$idx}{$i} .= ''.$4.'
//