/;
+ $discussionitems[$alldiscussion{$post}]=~s/]*)>//;
+ $discussionitems[$alldiscussion{$post}]=~s/]*)>]*)>//;
my $threadinsert='';
if ($thisdepth > 0) {
$threadinsert='Reply: '.$thisdepth.' ';
}
- $discussionitems[$alldiscussion{$_}]=~s/<\/td>]*)>/$threadinsert<\/td>/;
- $discussionitems[$alldiscussion{$_}]=~s/]+)>(Edit|Hide|Delete|Reply|Submissions)<\/a>//g;
- $discussionitems[$alldiscussion{$_}]=~s/(|<\/b>|<\/a>|]+)>)//g;
+ $discussionitems[$alldiscussion{$post}]=~s/<\/td>]*)>/$threadinsert<\/td>/;
+ $discussionitems[$alldiscussion{$post}]=~s/(|<\/b>|<\/a>|]+)>)//g;
- $discussionitems[$alldiscussion{$_}]='\vskip 0 mm\noindent\makebox[2 cm][b]{\hrulefill} '.$discussionitems[$alldiscussion{$_}];
- $discussion.=$discussionitems[$alldiscussion{$_}];
+ $discussionitems[$alldiscussion{$post}]='\vskip 0 mm\noindent\makebox[2 cm][b]{\hrulefill} '.$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 ' '."\n";
}
- $currdepth = $depth[$alldiscussion{$_}];
+ $currdepth = $depth[$alldiscussion{$post}];
print $manifestfile "\n".
- '- '.
- '
'.$imsitems{$alldiscussion{$_}}{'title'}.' ';
+ '- '.
+ '
'.$imsitems{$alldiscussion{$post}}{'title'}.' ';
$imsresources .= "\n".
- ''."\n".
+ ''."\n".
''."\n".
- $imsfiles{$alldiscussion{$_}}{$imsitems{$alldiscussion{$_}}{'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 '.
- $imsitems{$alldiscussion{$_}}{'title'}.' '.
- $imsitems{$alldiscussion{$_}}{'sender'}.
- $imsitems{$alldiscussion{$_}}{'timestamp'}.''.&mt('Discussion Post').' '.
+ $imsitems{$alldiscussion{$post}}{'title'}.' '.
+ $imsitems{$alldiscussion{$post}}{'sender'}.
+ $imsitems{$alldiscussion{$post}}{'timestamp'}.''. $discussionitems[$alldiscussion{$_}].
+ $discussion.=' '. $discussionitems[$alldiscussion{$post}].
'
-
-
+
+
+
-
-
-
-
- $lt{'cuse'} :
-
-
+
+ $lt{'cuse'} :
END
if ($newpostsflag) {
$discussion .=
@@ -578,27 +624,20 @@ 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('sections').' - '.$env{'form.sectionpick'};
$filterchoice .= ' ';
}
+ if (@grouppick > 0) {
+ $filterchoice = ''.&mt('groups').' - '.$env{'form.grouppick'};
+ $filterchoice .= ' ';
+ }
if (@rolefilter > 0) {
$filterchoice .= ''.&mt('roles').' -';
- foreach (@rolefilter) {
- $filterchoice .= ' '.$role_types{$_}.',';
+ foreach my $role (@rolefilter) {
+ $filterchoice .= ' '.$role_types{$role}.',';
}
$filterchoice =~ s/,$//;
- $filterchoice .= ''.&mt('status').' - '.$status_types{$statusfilter};
@@ -625,15 +668,16 @@ END
if ($filterchoice) {
$discussion .= ''.&mt('Filters').' : '.$filterchoice;
}
- $discussion .= ''.
- ' ';
}
$discussion .= (<
-
-
\n";
+ }
if ($outputtarget eq 'export') {
if ($manifestok) {
while ($currdepth > 0) {
@@ -666,22 +712,34 @@ END
#Create zip file in prtspool
- my $imszipfile = '/prtspool/'.
- $env{'user.name'}.'_'.$env{'user.domain'}.'_'.
- time.'_'.rand(1000000000).'.zip';
- my $cwd = &getcwd();
- my $imszip = '/home/httpd/'.$imszipfile;
- chdir $tempexport;
- open(OUTPUT, "zip -r $imszip * 2> /dev/null |");
- close(OUTPUT);
- chdir $cwd;
- $discussion .= 'Download the zip file from 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;
}
@@ -689,9 +747,8 @@ 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'}) {
@@ -699,83 +756,358 @@ END
$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.=(<
-Note: in anonymous discussion, your name is visible only
-to course faculty Title: New attachments ';
- foreach my $item (@currnewattach) {
- $item =~ m#.*/([^/]+)$#;
- $newattachmsg .= ''.$1.' '.
+ &mt('This discussion is closed.').' ';
+ }
+ }
+ }
+ if (!(&discussion_open($status)) && ($outputtarget ne 'tex')) {
+ $discussion.= ''.
+ &mt('This discussion is closed.').' ';
+ }
+ } elsif ($outputtarget ne 'tex') {
+ unless ($nofooter) {
+ $discussion.='';
+ unless ($nodisclink) {
+ if (&discussion_open($status) &&
+ &Apache::lonnet::allowed('pch',
+ $env{'request.course.id'}.
+ ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''))) {
+ $discussion.= &send_feedback_link($ressymb);
+ if ($env{'request.role.adv'}) {
+ my $close = &Apache::lonnet::EXT('resource.0.discussend',$ressymb);
+ my $canvote = &Apache::lonnet::EXT('resource.0.discussvote',$ressymb);
+ if (defined($close) && $close ne '' && $close < time) {
+ if ($canvote eq 'notended') {
+ $discussion .= ' '.&mt('(Posting and voting closed for [_1] roles)',
+ &Apache::lonnet::plaintext('st',$crstype));
+ } else {
+ $discussion .= ' '.&mt('(Closed for [_1] roles)',
+ &Apache::lonnet::plaintext('st',$crstype));
+ }
}
- $newattachmsg .= ''."\n";
- } else {
- $currnewattach[0] =~ m#.*/([^/]+)$#;
- $newattachmsg .= '
'.$1.' '."\n";
}
+ } else {
+ $discussion.= '
'.&mt('This discussion is closed.').' ';
}
- $discussion.=$newattachmsg;
- $discussion.=&generate_preview_button();
- }
- }
- } else {
- $discussion.='
';
+ unless ($nofdbklink) {
+ $discussion.= &send_message_link($ressymb);
+ }
+ $discussion.='
'.
+ &discussion_link($ressymb,
+ ' ';
+}
+
+sub send_message_link {
+ my ($ressymb) = @_;
+ my $output = ''.
+ &discussion_link($ressymb,
+ ' ';
+ return $output;
+}
+
+sub action_links_bar {
+ my ($colspan,$ressymb,$visible,$newpostsflag,$group,$prevread,$markondisp,
+ $seehidden) = @_;
+ my $discussion = ''.
+ ' $lt{'note'} $lt{'title'}: '.$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) {
- $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').' ';
- }
- $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'}} = ();
}
if (defined($$usernamesort{'__anon'}{'__anon'})) {
- push @{$$usernamesort{'__anon'}{'__anon'}}, $idx;
+ push(@{$$usernamesort{'__anon'}{'__anon'}}, $idx);
} else {
@{$$usernamesort{'__anon'}{'__anon'}} = ("$idx");
}
@@ -972,37 +1386,42 @@ 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.=' '.&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;
+ }
+ 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};
}
- $$discussionitems[$idx].= '
'.
- $message.' ';
+# 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 {
@@ -1125,9 +1626,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) {
@@ -1145,9 +1646,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)) {
@@ -1161,6 +1662,7 @@ sub filter_regexp {
$secregexp .= '[^:]*';
}
}
+
if (defined($statusfilter) && $statusfilter ne '') {
if ($statusfilter eq 'all') {
$statusregexp = '[^:]+';
@@ -1174,14 +1676,14 @@ 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) {
- $discussion=&mt('You do not have privileges to view all versions of posts.').&mt('Please select a different role');
+ unless($seehidden) {
+ $discussion=&mt('You do not have privileges to view all versions of posts.').' '.&mt('Please select a different role.');
return $discussion;
}
}
@@ -1192,13 +1694,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') {
@@ -1208,7 +1717,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);
@@ -1225,7 +1734,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.' '.&Apache::lontexconvert::msgtexconverted($message).' ';
- if ($idx > 0) {
- my %subversions = ();
- &get_post_versions(\%subversions,$contrib{$idx.':subject'},1,$numoldver);
- $subject = 'Re: '.$subversions{$numoldver};
- }
- $subject = &HTML::Entities::encode($subject,'<>&"');
- } else {
- $attachmenturls = $contrib{$idx.':attachmenturl'};
- if ($idx > 0) {
- my %msgversions = ();
- &get_post_versions(\%msgversions,$contrib{$idx.':message'},0,$numoldver);
+ &get_post_versions(\%msgversions,$contrib{$idx.':message'},0,$numoldver);
+ &get_post_versions(\%subversions,$contrib{$idx.':subject'},$htmldecode,
+ $numoldver);
+ $subject = $subversions{$numoldver};
+ if ($env{'form.replydisc'}) {
+ $quote = $msgversions{$numoldver};
+ $subject = &HTML::Entities::encode(&mt('Re: ').$subject,'<>&"');
+ } else {
$comment = $msgversions{$numoldver};
- my %subversions = ();
- &get_post_versions(\%subversions,$contrib{$idx.':subject'},0,$numoldver);
- $subject = $subversions{$numoldver};
}
+ }
+ if ($env{'form.editdisc'}) {
+ $attachmenturls = $contrib{$idx.':attachmenturl'};
if (defined($contrib{$idx.':replyto'})) {
$parentmsg = $contrib{$idx.':replyto'};
}
@@ -1449,8 +1954,10 @@ END
$comment = &unescape($env{'form.comment'});
&process_attachments(\@currnewattach,\@currdelold,\@keepold);
}
- my $latexHelp=&Apache::loncommon::helpLatexCheatsheet();
+ my $latexHelp=&Apache::loncommon::helpLatexCheatsheet(undef,undef,1,($env{'form.modal'}?'popup':0));
my $send=&mt('Send');
+ my $alert = &mt('Please select a feedback type.');
+ &js_escape(\$alert);
my $js= <
//
+
END
+ my ($textareaheader,$textareaclass);
+ if (&Apache::lonhtmlcommon::htmlareabrowser()) {
+ $textareaheader = &Apache::lonhtmlcommon::htmlareaselectactive();
+ $textareaclass = 'class="LC_richDefaultOff"';
+ if ($env{'request.course.id'}) {
+ unless (($env{'course.'.$env{'request.course.id'}.'.allow_limited_html_in_feedback'} =~ /^\s*yes\s*$/i) || ($env{'form.sendmessageonly'})) {
+ undef($textareaclass);
+ }
+ }
+ }
+
+ # Breadcrumbs
+ my $brcrum = [{'href' => '',
+ 'text' => 'Resource Feedback and Discussion'}];
+
my %onload = ('onload' => 'window.focus();setposttype();');
+ my %parms=('add_entries' => \%onload);
+ if ($env{'form.modal'} ne 'yes') { $parms{'bread_crumbs'} = $brcrum; }
my $start_page=
- &Apache::loncommon::start_page('Resource Feedback and Discussion',$js,
- {'add_entries' => \%onload});
+ &Apache::loncommon::start_page('Resource Feedback and Discussion',$js,\%parms);
+ if ($quote ne '') {
+ $quote = &HTML::Entities::decode($quote);
+ unless (&contains_block_html($quote)) {
+ &newline_to_br(\$quote);
+ }
+ $quote=&Apache::lonhtmlcommon::start_pick_box().
+ &Apache::lonhtmlcommon::row_title(&mt('Quote')).
+ &Apache::lontexconvert::msgtexconverted($quote).
+ &Apache::lonhtmlcommon::row_closure(1).
+ &Apache::lonhtmlcommon::end_pick_box();
+ }
+ my $header='';
+ unless ($env{'form.modal'}) {
+ $header="$restitle $title
+$lt{'myqu'}
+$header
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;
@@ -1567,10 +2130,10 @@ 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');
if ($attachnum > 0) {
if (@currnewattach > 0) {
- $newattachmsg .= 'New attachments '.&mt('New attachments').' ';
foreach my $item (@currnewattach) {
@@ -1584,15 +2147,15 @@ END
}
}
if ($attachmsg) {
- $r->print("Retained attachments :$attachmsg$lt{'reta'} :$attachmsg
+
$end_page
-END
+ ");
return;
}
@@ -1807,8 +2384,18 @@ sub print_sortfilter_options {
my @sections;
my $section_sel = '';
my $numvisible = 5;
+ my @groups;
+ my $group_sel = '';
+ my $numgroupvis = 5;
my %sectioncount = &Apache::loncommon::get_sections();
-
+ my @courseroles = qw(st ad ep ta in);
+ my $crstype = &Apache::loncommon::course_type();
+ my $ccrole = 'cc';
+ if ($crstype eq 'Community') {
+ $ccrole = 'co';
+ }
+ push(@courseroles,$ccrole);
+
if ($env{'request.course.sec'} !~ /^\s*$/) { #Restrict section choice to current section
@sections = ('all',$env{'request.course.sec'});
$numvisible = 2;
@@ -1820,10 +2407,36 @@ sub print_sortfilter_options {
unshift(@sections,'all'); # Put 'all' at the front of the list
}
- foreach (@sections) {
- $section_sel .= " $sec \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 my $group (@groups) {
+ $group_sel .= " $group \n";
}
-
+
my $function = &Apache::loncommon::get_users_function();
my $tabcolor = &Apache::loncommon::designparm($function.'.tabbg',
$env{'user.domain'});
@@ -1836,14 +2449,16 @@ 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' => 'Save changes',
);
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);
my $js = <
@@ -1867,6 +2482,17 @@ function verifyFilter() {
if (secnum == 0) {
document.modifyshown.sectionpick.options[0].selected = true
}
+
+ var grpnum = 0
+ for (var i=0; i
@@ -1879,73 +2505,91 @@ END
$r->print(<
+
$end_page
-END
+");
}
sub print_showposters {
@@ -1955,24 +2599,28 @@ sub print_showposters {
$r->send_http_header;
&Apache::lonenc::check_encrypt(\$symb);
- my $crs='/'.$env{'request.course.id'};
- if ($env{'request.course.sec'}) {
- $crs.='_'.$env{'request.course.sec'};
- }
- $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 $group = $env{'form.group'};
+ my $ressymb = &wrap_symb($symb);
+ my $seehidden = &can_see_hidden('',$ressymb,$feedurl,$group,$cdom,$cnum);
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)) {
+ unless ((($hidden) && (!$seehidden)) || ($deleted)) {
+ 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'};
@@ -1989,44 +2637,44 @@ 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");
}
}
}
- }
+ }
}
my $start_page = &Apache::loncommon::start_page('Discussion options');
my $table_start =&Apache::loncommon::start_data_table();
$r->print(<
+
$end_page
END
@@ -2102,43 +2751,66 @@ sub get_post_attachments {
$$attachments{'0'}{'filename'} = $attachmenturls;
$$attachments{'0'}{'0'} = 'n';
}
-
return;
}
sub fail_redirect {
- my ($r,$feedurl) = @_;
+ my ($r,$feedurl,$delay) = @_;
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,}));
+ my %parms=('only_body' => 1);
+ if ($delay !~ /^\d+(|\.\d+)$/) {
+ $delay = 2;
+ }
+ if ($env{'form.modal'}) {
+ my $onload = 'document.forms.reldt.submit()';
+ if ($delay) {
+ my $js_delay = int(1000 * $delay);
+ $onload = "setTimeout(function(){
+ document.forms.reldt.submit();
+ },$js_delay);";
+ }
+ $parms{'add_entries'}={'onload' => $onload};
+ } else {
+ $parms{'redirect'}=[$delay,$feedurl];
+ }
+ $r->print(&Apache::loncommon::start_page('Feedback not sent',undef,\%parms));
+ my $windowname = 'loncapaclient';
+ if ($env{'request.lti.login'}) {
+ $windowname .= 'lti';
+ }
$r->print(<Sorry, no recipients ...
+$lt{'sorr'}
+
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,$toolarge,$delay) = @_;
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) {
$qrystr = 'previous='.$previous;
if ($feedurl =~ /\?register=1/) {
- $feedurl .= '&'.$qrystr;
+ $feedurl .= '&'.$qrystr;
} else {
$feedurl .= '?'.$qrystr;
}
@@ -2147,162 +2819,283 @@ sub redirect_back {
if (defined($sort)) {
my $sortqry = 'sortposts='.$sort;
if (($feedurl =~ /\?register=1/) || ($feedurl =~ /\?previous=/)) {
- $feedurl .= '&'.$sortqry;
+ $feedurl .= '&'.$sortqry;
} else {
$feedurl .= '?'.$sortqry;
}
$sorttag = 'Sent $sendsomething message(s), and $sendposts post(s).
$blog
+$toolarge
$status
-
$end_page
ENDREDIR
}
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 ($r,$feedurl,$delay) = @_;
+ my $nofeed=&mt('Sorry, no feedback possible on this resource ...');
+ my $form_for_modal;
+ my %parms=('only_body' => 1,
+ 'bgcolor' => '#FFFFFF',);
+ if ($delay !~ /^\d+(|\.\d+)$/) {
+ $delay = 0;
}
-
- my %body_options = ('only_body' => 1,
- 'bgcolor' => '#FFFFFF',
- 'add_entries' => \%onload,);
-
- if ($feedurl !~ m{^/adm/feedback}) {
- $body_options{'rediect'} = [2,$feedurl];
+ if ($env{'form.modal'}) {
+ if (($feedurl !~ m{^/adm/feedback}) && ($feedurl ne '')) {
+ my $onload = 'document.forms.reldt.submit()';
+ if ($delay) {
+ my $js_delay = int(1000 * $delay);
+ $onload = "setTimeout(function(){
+ document.forms.reldt.submit();
+ },$js_delay);";
+ }
+ $parms{'add_entries'}={'onload' => $onload};
+ my $windowname = 'loncapaclient';
+ if ($env{'request.lti.login'}) {
+ $windowname .= 'lti';
+ }
+ $form_for_modal = <
+
+ENDFORM
+ }
+ } else {
+ if (($feedurl !~ m{^/adm/feedback}) && ($feedurl ne '')) {
+ $parms{'redirect'}=[$delay,$feedurl];
+ }
}
+
my $start_page=
&Apache::loncommon::start_page('Feedback not sent',undef,
- \%body_options);
-
+ \%parms);
+
my $end_page = &Apache::loncommon::end_page();
- $feedurl=&Apache::lonenc::check_encrypt($feedurl);
my $logo=&Apache::loncommon::lonhttpdurl('/adm/lonIcons/lonlogos.gif');
$r->print (<$nofeed
';
- }
- if (&feedback_available(1)) {
- $msgoptions.=
- '
';
- }
- if (&feedback_available(0,1)) {
- $msgoptions.=
- '
';
- }
- if (&feedback_available(0,0,1)) {
- $msgoptions.=
- '
';
- }
+ if (($feedurl=~/^\/res\//) && ($feedurl!~/^\/res\/adm/) && ($env{'user.adv'})) {
+ $fdbkoptions{'author'} = 1;
+ }
+ if (&feedback_available(1)) {
+ $fdbkoptions{'question'} = 1;
+ }
+ if (&feedback_available(0,1)) {
+ $fdbkoptions{'course'} = 1;
+ }
+ if (&feedback_available(0,0,1)) {
+ $fdbkoptions{'policy'} = 1;
+ }
}
if (($env{'request.course.id'}) && (!$env{'form.sendmessageonly'})) {
- if (&discussion_open(undef,$symb) &&
- &Apache::lonnet::allowed('pch',
- $env{'request.course.id'}.
- ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''))) {
- $discussoptions='('.&mt('name only visible to course faculty').') '.&mt('Change Screenname').' ';
+ my ($blocked,$blocktext) = &Apache::loncommon::blocking_status('boards');
+ my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+ my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+ my $realsymb = &get_realsymb($symb);
+ if (!$blocked && &discussion_open(undef,$realsymb) &&
+ (&Apache::lonnet::allowed('pch',
+ $env{'request.course.id'}.
+ ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:'')) ||
+ (($group ne '') && ($symb =~ m{^bulletin___\d+___adm/wrapper/adm/\Q$cdom\E/\Q$cnum\E/\d+/bulletinboard$}) && (&check_group_priv($group,'pgd') eq 'ok')))) {
+ $discoptions{'nonanon'} = 1;
+ if (&Apache::lonnet::allowed('pac',$env{'request.course.id'}.
+ ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''))) {
+ $discoptions{'anon'} = 1;
+ }
+ $blockblog = &Apache::loncommon::blocking_status('blogs');
+ }
+ }
+ my $total = scalar(keys(%fdbkoptions)) + scalar(keys(%discoptions));
+ return if (!$total);
+ if ($total == 1) {
+ $checkradio = ' checked="checked"';
+ }
+ if (keys(%fdbkoptions)) {
+ if ($fdbkoptions{'author'}) {
+ $msgoptions =
+ '('.$namevis.') '.&mt('Change Screenname').' ';
+ }
+ if (!$blockblog) {
+ $discussoptions.= &add_blog_checkbox($crstype);
+ }
+ }
+ if ($msgoptions) {
+ $msgoptions=''.$msgoptions.' '.$discussoptions.' -tag
my %html=(M=>1);
# Check if more is allowed
@@ -2330,181 +3121,193 @@ sub clear_out_html {
($override)) {
# allows
#
- #
+ #
%html=(B=>1, I=>1, P=>1, A=>1, LI=>1, OL=>1, UL=>1, EM=>1,
- BR=>1, TT=>1, STRONG=>1, BLOCKQUOTE=>1, DIV=>1, IMG=>1,
- M=>1, ALGEBRA=>1, SUB=>1, SUP=>1, SPAN=>1,
- H1=>1, H2=>1, H3=>1, H4=>1, H5=>1);
+ BR=>1, TT=>1, STRONG=>1, BLOCKQUOTE=>1, PRE=>1, DIV=>1, IMG=>1,
+ M=>1, CHEM=>1, ALGEBRA=>1, SUB=>1, SUP=>1, SPAN=>1,
+ H1=>1, H2=>1, H3=>1, H4=>1, H5=>1, H6=>1,
+ TABLE=>1, TR=>1, TD=>1, TH=>1, TBODY=>1);
}
# Do the substitution of everything that is not explicitly allowed
- $message =~ s/\<(\/?\s*(\w*)[^\>\<]*)/
+ $message =~ s/\<(\/?\s*(\w+)[^\>\<]*)/
{($html{uc($2)}&&(length($1)<1000))?"\<$1":"\<$1"}/ge;
- $message =~ s/(\]*)\>/
+ $message =~ s/(\]*)\>/
{($html{uc($2)}&&(length($1)<1000))?"$1\>":"$1\>"}/ge;
return $message;
}
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)',
+ );
+ if (&Apache::loncommon::course_type() eq 'Community') {
+ $lt{'prev'} = &mt('Previous attempts of member (if applicable)');
+ }
my $email=<<"ENDEMAIL";
$message
ENDEMAIL
my $citations=<<"ENDCITE";
-Previous attempts of student (if applicable)
+$lt{'prev'}
$prevattempts
Original screen output (if applicable)
+$lt{'orig'}
$usersaw
-Correct Answer(s) (if applicable)
+$lt{'corr'}
$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.
- 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.discuss'} eq 'author' ||$author) {
- $typestyle.='Submitting as Author Feedback'.
+ &mt('This does not affect delivery of feedback to your instructor(s).').
+ ' '.
+ &mt('Note: some types of communication functionality are blocked for certain IP address(es).').
+ ' '.
+ &mt('This restriction was set by an administrator in the [_1] LON-CAPA domain.',
+ $showdom).
+ ' '.
- 'Subject: '.$subject.'
'.$end_page);
+ $r->print($start_page
+ .''.&mt('Preview').' '
+ .&Apache::lonhtmlcommon::start_pick_box()
+ .&Apache::lonhtmlcommon::row_title(&mt('Subject'))
+ .$subject
+ .&Apache::lonhtmlcommon::row_closure()
+ .&Apache::lonhtmlcommon::row_title(&mt('Message'))
+ .$message
+ .&Apache::lonhtmlcommon::row_closure(1)
+ .&Apache::lonhtmlcommon::end_pick_box()
+ .$end_page
+ );
+}
+
+sub contains_block_html {
+ my ($message)=@_;
+ return ($message =~ m{
+ <(br|h1|h2|h3|h4|h5|h6|p|ol|ul|table|pre|address|blockquote|center|div)
+ \s*
+ (\w+\=['"]\w+['"])*
+ \s*
+ (
+ \s*/>|
+ >.*
+ )}xs
+ );
}
+sub tidy_html {
+ my ($message)=@_;
+# my $tidy = HTML::Tidy::libXML->new();
+# my $xhtml = $tidy->clean($message, 'utf-8', 1);
+# $xhtml =~ m/(.*)<\/body>/is;
+# my $clean = $1;
+# # remove any empty block-level tags
+# $clean =~ s/<(table|p|div|tbody|blockquote|m|pre|algebra|center|ol|ul|span|h1|h2|h3|h4|h5|h6)\s*\/>//i;
+# $message=$clean;
+ return $message;
+}
sub newline_to_br {
my ($message)=@_;
@@ -2652,18 +3636,47 @@ sub generate_preview_button {
return(<
+ function setAction () {
+ document.modattachments.action = document.modattachments.origpage.value;
+ document.modattachments.submit();
+ }
+
+
+END
+
+ # Breadcrumbs
+ my $brcrum = [{'href' => '',
+ 'text' => 'Discussion Post Attachments'}];
+ my %parms=('only_body' => 1);
+ if ($env{'form.modal'} ne 'yes') { $parms{'bread_crumbs'} = $brcrum; }
+
+ my $start_page =
+ &Apache::loncommon::start_page('Discussion Post Attachments',$js,\%parms);
+
my $orig_subject = &unescape($env{'form.subject'});
- my $subject=&clear_out_html($orig_subject,undef,1);
+ my $subject=&clear_out_html($orig_subject);
$subject=~s/\n/\
- function setAction () {
- document.modattachments.action = document.modattachments.origpage.value;
- document.modattachments.submit();
- }
-
-END
- my $start_page =
- &Apache::loncommon::start_page('Discussion Post Attachments',$js);
my $end_page =
&Apache::loncommon::end_page();
$r->print(<
-