--- loncom/interface/lonfeedback.pm 2006/12/08 00:28:59 1.231
+++ loncom/interface/lonfeedback.pm 2012/12/19 05:18:31 1.361
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Feedback
#
-# $Id: lonfeedback.pm,v 1.231 2006/12/08 00:28:59 raeburn Exp $
+# $Id: lonfeedback.pm,v 1.361 2012/12/19 05:18:31 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -41,6 +41,7 @@ use Apache::lonnavmaps;
use Apache::lonenc();
use Apache::lonrss();
use HTML::LCParser();
+#use HTML::Tidy::libXML;
use Apache::lonspeller();
use Apache::longroup;
use Cwd;
@@ -48,13 +49,22 @@ use LONCAPA;
sub discussion_open {
my ($status,$symb)=@_;
+# Advanced roles can always discuss
if ($env{'request.role.adv'}) { return 1; }
+# Get discussion closing date
+ my $close=&Apache::lonnet::EXT('resource.0.discussend',$symb);
+# If it is defined and in the future, the instructor wants this discussion to be open
+ if (defined($close) && $close ne '' && $close > time) {
+ return 1;
+ }
+# It was not explicitly open, check if the problem is available.
+# If the problem is not available, close the discussion
if (defined($status) &&
!($status eq 'CAN_ANSWER' || $status eq 'CANNOT_ANSWER'
|| $status eq 'OPEN')) {
return 0;
}
- my $close=&Apache::lonnet::EXT('resource.0.discussend',$symb);
+# The problem is available, but check if the instructor explictly closed discussion
if (defined($close) && $close ne '' && $close < time) {
return 0;
}
@@ -72,8 +82,31 @@ sub discussion_visible {
return 1;
}
+sub discussion_vote_available {
+ my ($status,$symb)=@_;
+ my $canvote=&Apache::lonnet::EXT('resource.0.discussvote',$symb);
+ if ((lc($canvote) eq 'yes') ||
+ ((lc($canvote) eq 'notended') && (&discussion_open($status,$symb)))) {
+ return 1;
+ }
+}
+
+sub get_realsymb {
+ my ($symb) = @_;
+ my $realsymb = $symb;
+ if ($symb=~/^bulletin___/) {
+ my $filename=(&Apache::lonnet::decode_symb($symb))[2];
+ $filename=~s{^adm/wrapper/}{};
+ $realsymb=&Apache::lonnet::symbread($filename);
+ }
+ return $realsymb;
+}
+
sub list_discussion {
my ($mode,$status,$ressymb,$imsextras,$group)=@_;
+ unless ($ressymb) { $ressymb=&Apache::lonnet::symbread(); }
+ unless ($ressymb) { return ''; }
+ $ressymb=&wrap_symb($ressymb);
my $outputtarget=$env{'form.grade_target'};
if (defined($env{'form.export'})) {
if($env{'form.export'}) {
@@ -85,19 +118,32 @@ sub list_discussion {
$outputtarget = 'export';
}
}
- if (not &discussion_visible($status)) { return ''; }
+ if (not &discussion_visible($status)) {
+ if ($mode ne 'board') {
+ &Apache::lonenc::check_encrypt(\$ressymb);
+ return '<br /><div class="LC_feedback_link">'.&send_message_link($ressymb)."</div>";
+ }
+ }
if ($group ne '' && $mode eq 'board') {
if (&check_group_priv($group,'vgb') ne 'ok') {
return '';
}
}
- my ($blocked,$blocktext) = &blocking_posts('boards',1);
+ my ($blocked,$blocktext) =
+ &Apache::loncommon::blocking_status('boards');
if ($blocked) {
- return $blocktext;
+ $blocktext = '<br /><div class="LC_feedback_link"><span class="LC_feedback_link">'.$blocktext."</span>";
+ &Apache::lonenc::check_encrypt(\$ressymb);
+ if ($mode ne 'board') {
+ $blocktext.=&send_message_link($ressymb).'</div>';
+ }else{
+ $blocktext.="</div>";
+ }
+ return $blocktext;
}
- my @bgcols = ("#cccccc","#eeeeee");
+ my @bgcols = ("LC_disc_old_item","LC_disc_new_item");
my $discussiononly=0;
if ($mode eq 'board') { $discussiononly=1; }
unless ($env{'request.course.id'}) { return ''; }
@@ -107,12 +153,9 @@ sub list_discussion {
$crs.='_'.$env{'request.course.sec'};
}
$crs=~s/\_/\//g;
- unless ($ressymb) { $ressymb=&Apache::lonnet::symbread(); }
- unless ($ressymb) { return ''; }
- $ressymb=&wrap_symb($ressymb);
my $encsymb=&Apache::lonenc::check_encrypt($ressymb);
my $viewgrades=(&Apache::lonnet::allowed('vgr',$crs)
- && ($ressymb=~/\.(problem|exam|quiz|assess|survey|form|task)$/));
+ && ($ressymb=~/$LONCAPA::assess_re/));
my %usernamesort = ();
my %namesort =();
@@ -159,6 +202,7 @@ sub list_discussion {
my $cdom = $env{'course.'.$cid.'.domain'};
my $cnum = $env{'course.'.$cid.'.num'};
+ my $crstype = &Apache::loncommon::course_type();
# Get information about students and non-students in course for filtering display of posts
my %roleshash = ();
@@ -233,14 +277,15 @@ sub list_discussion {
$visit ++;
my $seeid;
- if (($group ne '') && ($mode eq 'board') &&
- ($ressymb =~ m|^bulletin___\d+___adm/wrapper/adm/\Q$cdom\E/\Q$cnum\E/\d+/bulletinboard$|)) {
- if (&check_group_priv($group,'dgp') eq 'ok') {
- $seeid = 1;
- }
- } else {
- $seeid=&Apache::lonnet::allowed('rin',$crs);
+ if (&Apache::lonnet::allowed('rin',$env{'request.course.id'}.($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''))) {
+ $seeid = 1;
}
+ my $seehidden = &can_see_hidden($mode,$ressymb,undef,$group,$cdom,$cnum,$crs);
+
+# Is voting on discussions available
+ my $realsymb = &get_realsymb($ressymb);
+ my $canvote = &discussion_vote_available($status,$realsymb);
+
my @discussionitems=();
my %shown = ();
my @posteridentity=();
@@ -257,17 +302,12 @@ sub list_discussion {
my $maxdepth=0;
my %anonhash=();
my $anoncnt=0;
- my $target='';
- unless ($env{'browser.interface'} eq 'textual' ||
- $env{'environment.remote'} eq 'off' ) {
- $target='target="LONcom"';
- }
my $now = time;
$discinfo{$visitkey} = $visit;
&Apache::lonnet::put('nohist_'.$cid.'_discuss',\%discinfo,$env{'user.domain'},$env{'user.name'});
- &build_posting_display(\%usernamesort,\%subjectsort,\%namesort,\%notshown,\%newitem,\%dischash,\%shown,\%alldiscussion,\%imsitems,\%imsfiles,\%roleinfo,\@discussionitems,\@replies,\@depth,\@posters,\$maxdepth,\$visible,\$newpostsflag,\$current,$status,$viewgrades,$seeid,$prevread,$sortposts,$encsymb,$target,$readkey,$showunmark,$showonlyunread,$totposters,\@rolefilter,\@sectionpick,\@grouppick,$classgroups,$statusfilter,$toggkey,$outputtarget,\%anonhash,$anoncnt,$group);
+ &build_posting_display(\%usernamesort,\%subjectsort,\%namesort,\%notshown,\%newitem,\%dischash,\%shown,\%alldiscussion,\%imsitems,\%imsfiles,\%roleinfo,\@discussionitems,\@replies,\@depth,\@posters,\$maxdepth,\$visible,\$newpostsflag,\$current,$status,$viewgrades,$seeid,$seehidden,$canvote,$prevread,$sortposts,$encsymb,$readkey,$showunmark,$showonlyunread,$totposters,\@rolefilter,\@sectionpick,\@grouppick,$classgroups,$statusfilter,$toggkey,$outputtarget,\%anonhash,$anoncnt,$group);
my $discussion='';
my $manifestfile;
@@ -277,10 +317,8 @@ sub list_discussion {
my $copyresult;
my $function = &Apache::loncommon::get_users_function();
- my $color = &Apache::loncommon::designparm($function.'.tabbg',
- $env{'user.domain'});
my %lt = &Apache::lonlocal::texthash(
- 'cuse' => 'Current discussion settings',
+ 'cuse' => 'My settings for this discussion',
'allposts' => 'All posts',
'unread' => 'New posts only',
'unmark' => 'Unread only',
@@ -302,6 +340,7 @@ sub list_discussion {
'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.',
+ 'discussions' => 'DISCUSSIONS'
);
my $currdisp = $lt{'allposts'};
@@ -342,10 +381,10 @@ sub list_discussion {
$togglink = 'toggoff';
}
- $chglink .= '&changes='.$displinkA.'_'.$displinkB.'_'.$marklink.'_'.$togglink;
+ $chglink .= '&changes='.$displinkA.'_'.$displinkB.'_'.$marklink.'_'.$togglink;
if ($newpostsflag) {
- $chglink .= '&previous='.$prevread;
+ $chglink .= '&previous='.$prevread;
}
$chglink.=&group_args($group);
@@ -353,8 +392,7 @@ sub list_discussion {
# Print the discusssion
if ($outputtarget eq 'tex') {
$discussion.='<tex>{\tiny \vskip 0 mm\noindent\makebox[2 cm][b]{\hrulefill}'.
- '\textbf{DISCUSSIONS}\makebox[2 cm][b]{\hrulefill}'.
- '\vskip 0 mm\noindent\textbf{'.$lt{'cuse'}.'}:\vskip 0 mm'.
+ '\textbf{'.$lt{'discussions'}.'}\makebox[2 cm][b]{\hrulefill}\vskip 0 mm'.
'\noindent\textbf{'.$lt{'disa'}.'}: \textit{'.$currdisp.'}\vskip 0 mm'.
'\noindent\textbf{'.$lt{'npce'}.'}: \textit{'.$currmark.'}}</tex>';
} elsif ($outputtarget eq 'export') {
@@ -388,8 +426,7 @@ sub list_discussion {
my $manifestfilename = $tempexport.$manifest;
if ($manifestfile = Apache::File->new('>'.$manifestfilename)) {
$manifestok=1;
- print $manifestfile qq|
-<?xml version="1.0" encoding="UTF-8"?>
+ print $manifestfile qq|<?xml version="1.0" encoding="UTF-8"?>
<manifest xmlns="http://www.imsglobal.org/xsd/imscp_v1p1" xmlns:imsmd="http://www.imsglobal.org/xsd/imsmd_v1p2"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
identifier="MANIFEST-$ressymb" xsi:schemaLocation="http://www.imsglobal.org/xsd/imscp_v1p1
@@ -402,13 +439,12 @@ imscp_v1p1.xsd http://www.imsglobal.org/
}
} else {
my $colspan=$maxdepth+1;
- $discussion.= qq|
-<script>
+ $discussion.= &Apache::lonhtmlcommon::scripttag(qq|
function verifydelete (caller,symb,idx,newflag,previous,groupparm) {
var symbparm = symb+':::'+idx
var prevparm = ""
if (newflag == 1) {
- prevparm = "&previous="+previous
+ prevparm = "&previous="+previous
}
if (caller == 'studentdelete') {
if (confirm("$lt{'aysu'}\\n$lt{'dpwn'},\\n$lt{'bwco'}")) {
@@ -422,12 +458,12 @@ imscp_v1p1.xsd http://www.imsglobal.org/
}
}
}
-</script>
- |;
- $discussion.='<form name="readchoices" method="post" action="/adm/feedback?chgreads='.$ressymb.'" ><table bgcolor="#AAAAAA" cellpadding="2" cellspacing="2" border="0">';
+ |);
+ $discussion.='<form name="readchoices" method="post" action="/adm/feedback?chgreads='.$ressymb.'" >'.
+ "\n".'<table width="100%" class="LC_discussion">';
$discussion .= &action_links_bar($colspan,$ressymb,$visible,
$newpostsflag,$group,
- $prevread,$markondisp);
+ $prevread,$markondisp,$seehidden);
my $escsymb=&escape($ressymb);
my $numhidden = keys(%notshown);
if ($numhidden > 0) {
@@ -435,7 +471,7 @@ imscp_v1p1.xsd http://www.imsglobal.org/
$discussion.="\n".'<tr><td bgcolor="#CCCCCC" colspan="'.$colspan.'">'.
'<a href="/adm/feedback?allposts=1&symb='.$escsymb;
if ($newpostsflag) {
- $discussion .= '&previous='.$prevread;
+ $discussion .= '&previous='.$prevread;
}
$discussion .= &group_args($group);
$discussion .= '">'.&mt('Show all posts').'</a> '.&mt('to display').' '.
@@ -477,7 +513,9 @@ imscp_v1p1.xsd http://www.imsglobal.org/
my $currdepth = 0;
my $firstidx = $alldiscussion{$showposts[0]};
foreach my $post (@showposts) {
- unless (($sortposts eq 'thread') || (($sortposts eq '') && ($env{'environment.threadeddiscussion'})) || ($outputtarget eq 'export')) {
+ unless (($sortposts eq 'thread') ||
+ (($sortposts eq '') && (!$env{'environment.unthreadeddiscussion'})) ||
+ ($outputtarget eq 'export')) {
$alldiscussion{$post} = $post;
}
unless ( ($notshown{$alldiscussion{$post}} eq '1') || ($shown{$alldiscussion{$post}} == 0) ) {
@@ -487,7 +525,7 @@ imscp_v1p1.xsd http://www.imsglobal.org/
my $thisdepth=$depth[$alldiscussion{$post}];
if ($outputtarget ne 'tex' && $outputtarget ne 'export') {
for (1..$thisdepth) {
- $discussion.='<td> </td>';
+ $discussion.='<td> </td>';
}
}
my $colspan=$maxdepth-$thisdepth+1;
@@ -500,7 +538,6 @@ imscp_v1p1.xsd http://www.imsglobal.org/
$threadinsert='<br /><strong>Reply: '.$thisdepth.'</strong>';
}
$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{$post}]='<tex>\vskip 0 mm\noindent\makebox[2 cm][b]{\hrulefill}</tex>'.$discussionitems[$alldiscussion{$post}];
@@ -515,11 +552,11 @@ imscp_v1p1.xsd http://www.imsglobal.org/
print $manifestfile "\n".
'<item identifier="ITEM-'.$ressymb.'-'.$alldiscussion{$post}.'" isvisible="'.
$imsitems{$alldiscussion{$post}}{'isvisible'}.'" identifieref="RES-'.$ressymb.'-'.$alldiscussion{$post}.'">'.
- '<title>'.$imsitems{$alldiscussion{$post}}{'title'}.'</title>';
+ '<title>'.$imsitems{$alldiscussion{$post}}{'title'}.'</title></item>';
$imsresources .= "\n".
'<resource identifier="RES-'.$ressymb.'-'.$alldiscussion{$post}.'" type="webcontent" href="'.$postfilename.'">'."\n".
'<file href="'.$postfilename.'">'."\n".
- $imsfiles{$alldiscussion{$post}}{$imsitems{$alldiscussion{$post}}{'currversion'}}."\n".
+ $imsfiles{$alldiscussion{$post}}{$imsitems{$alldiscussion{$post}}{'currversion'}}.'</file>'."\n".
'</resource>';
}
my $postingfile;
@@ -537,7 +574,7 @@ imscp_v1p1.xsd http://www.imsglobal.org/
}
$copyresult.=&replicate_attachments($imsitems{$alldiscussion{$post}}{'allattachments'},$tempexport);
} else {
- $discussion.='<td bgcolor="'.$bgcols[$newitem{$alldiscussion{$post}}].
+ $discussion.='<td class="'.$bgcols[$newitem{$alldiscussion{$post}}].
'" colspan="'.$colspan.'">'. $discussionitems[$alldiscussion{$post}].
'</td></tr>';
}
@@ -546,17 +583,12 @@ imscp_v1p1.xsd http://www.imsglobal.org/
unless ($outputtarget eq 'tex' || $outputtarget eq 'export') {
my $colspan=$maxdepth+1;
$discussion .= <<END;
- <tr bgcolor="#FFFFFF">
- <td colspan="$colspan" valign="top">
- <table border="0" bgcolor="#FFFFFF" width="100%" cellspacing="2" cellpadding="2">
+ <tr>
+ <td colspan="$colspan">
+ <table width="100%">
<tr>
- <td align="left">
- <table border="0" cellpadding="0" cellspacing="4">
- <tr>
- <td>
- <font size="-1"><b>$lt{'cuse'}</b>:</td>
- <td> </td>
- <td><font size="-1">
+ <td class="LC_disc_action_left">
+ <font size="-1"><b>$lt{'cuse'}</b>:
END
if ($newpostsflag) {
$discussion .=
@@ -573,22 +605,16 @@ END
}
}
$discussion .= <<END;
- </font></td>
- <td> </td>
- <td align="left">
- <font size="-1"><b><a href="$chglink">$lt{'chgt'}</a>?</font></b>
- </td>
- </tr>
- </table>
+ <b><a href="$chglink">$lt{'chgt'}</a></b></font>
</td>
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 .= '<td><font size="-1"><b>'.&mt('Sorted by').'</b>: '.$sort_types{$sortposts}.'<br />';
+ $discussion .= '<td class="LC_disc_action_right"><font size="-1"><b>'.&mt('Sorted by').'</b>: '.$sort_types{$sortposts}.'<br />';
if (defined($env{'form.totposters'})) {
$discussion .= &mt('Posts by').':';
if ($totposters > 0) {
@@ -615,7 +641,7 @@ END
$filterchoice .= ' '.$role_types{$role}.',';
}
$filterchoice =~ s/,$//;
- $filterchoice .= '<br />     ';
+ $filterchoice .= '<br />'.(' ' x8);
}
if ($statusfilter) {
$filterchoice .= '<i>'.&mt('status').'</i>- '.$status_types{$statusfilter};
@@ -623,15 +649,16 @@ END
if ($filterchoice) {
$discussion .= '<b>'.&mt('Filters').'</b>: '.$filterchoice;
}
- $discussion .= '</font></td>';
}
+ $discussion .= '</font></td>';
+
}
if ($dischash{$toggkey}) {
- my $storebutton = &mt('Store read/unread changes');
+ my $storebutton = &mt('Save read/unread changes');
$discussion.='<td align="right">'.
- '<input type="hidden" name="discsymb" value="'.$ressymb.'">'."\n".
+ '<input type="hidden" name="discsymb" value="'.$ressymb.'" />'."\n".
'<input type="button" name="readoptions" value="'.$storebutton.'"'.
- ' onClick="this.form.submit();">'."\n".
+ ' onclick="this.form.submit();" />'."\n".
'</td>';
}
$discussion .= (<<END);
@@ -642,10 +669,8 @@ END
END
$discussion .= &action_links_bar($colspan,$ressymb,$visible,
$newpostsflag,$group,
- $prevread,$markondisp);
- $discussion .= "
- </table>
- <br /><br /></form>\n";
+ $prevread,$markondisp,$seehidden);
+ $discussion .= "</table></form>\n";
}
if ($outputtarget eq 'export') {
if ($manifestok) {
@@ -705,86 +730,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.= '<span class="LC_feedback_link">'.
+ &mt('This discussion is closed.').'</span>';
+ }
}
}
- } else {
- $discussion.='<table bgcolor="#BBBBBB"><tr><td>';
+ if (!(&discussion_open($status)) && ($outputtarget ne 'tex')) {
+ $discussion.= '<span class="LC_feedback_link">'.
+ &mt('This discussion is closed.').'</span>';
+ }
+ } elsif ($outputtarget ne 'tex') {
+ $discussion.='<div class="LC_feedback_link">';
if (&discussion_open($status) &&
&Apache::lonnet::allowed('pch',
$env{'request.course.id'}.
($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''))) {
- if ($outputtarget ne 'tex') {
- $discussion.='<a href="/adm/feedback?replydisc='.
- &escape($ressymb).':::" '.$target.'>'.
- '<img alt="" src="'.&Apache::loncommon::lonhttpdurl('/adm/lonMisc/chat.gif').'" border="0" />'.
- &mt('Post Discussion').'</a><br />';
+ $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));
+ }
+ }
}
- }
- $discussion.='<a href="/adm/feedback?sendmessageonly=1&symb='.
- &escape($ressymb).
- '"><img alt="" src="'.&Apache::loncommon::lonhttpdurl('/adm/lonMisc/feedback.gif').'" border="0" />'.
- &mt('Send Message').'</a></td></tr></table>';
+ } else {
+ $discussion.= '<span class="LC_feedback_link">'.&mt('This discussion is closed.').'</span>';
+ }
+ $discussion.= &send_message_link($ressymb).'</div>';
}
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) = @_;
+ return '<span class="LC_feedback_link">'.
+ &discussion_link($ressymb,
+ '<img alt="" class="LC_noBorder" src="'.
+ &Apache::loncommon::lonhttpdurl('/adm/lonMisc/chat.gif').
+ '" border="0" /><span class="LC_menubuttons_inline_text">'.&mt('Post Discussion').'</span>',
+ 'replydisc').
+ '</span>';
+}
+
+sub send_message_link {
+ my ($ressymb) = @_;
+ my $output = '<span class="LC_message_link">'.
+ &discussion_link($ressymb,
+ '<img alt="" class="LC_noBorder" src="'.
+ &Apache::loncommon::lonhttpdurl('/res/adm/pages/feedback.png').
+ '" border="0" /><span class="LC_menubuttons_inline_text">'.&mt('Send Feedback').'</span>',
+ 'sendmessageonly').
+ '</span>';
+ return $output;
+}
+
sub action_links_bar {
- my ($colspan,$ressymb,$visible,$newpostsflag,$group,$prevread,$markondisp) = @_;
- my $discussion = '<tr><td bgcolor="#DDDDBB" colspan="'.$colspan.'">'.
- '<table border="0" width="100%" bgcolor="#DDDDBB"><tr>';
+ my ($colspan,$ressymb,$visible,$newpostsflag,$group,$prevread,$markondisp,
+ $seehidden) = @_;
+ my $discussion = '<tr><td colspan="'.$colspan.'">'.
+ '<table width="100%"><tr>'.
+ '<td class="LC_disc_action_left">';
my $escsymb=&escape($ressymb);
- if ($visible>2) {
- $discussion .= '<td align="left">'.
- '<a href="/adm/feedback?cmd=threadedon&symb='.$escsymb;
+ if ($visible) {
+ $discussion .= '<a href="/adm/feedback?cmd=threadedon&symb='.$escsymb;
if ($newpostsflag) {
- $discussion .= '&previous='.$prevread;
+ $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 .= '&previous='.$prevread;
}
$discussion .= &group_args($group);
- $discussion .='">'.&mt('Chronological View').'</a>
- <a href= "/adm/feedback?cmd=sortfilter&symb='.$escsymb;
+ $discussion .='">'.&mt('Chronological View').'</a> ';
+
+ 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').'</a>  ';
- } else {
- $discussion .= '<td align="left">';
+ $otherviewurl .= &group_args($group);
+ $discussion .= &Apache::loncommon::modal_link($otherviewurl,&mt('Other Views ...'),800,340);
+ $discussion .= '<br />';
}
- $discussion .='<a href= "/adm/feedback?export='.$escsymb;
+ $discussion .='<a href="/adm/feedback?export='.$escsymb;
if ($newpostsflag) {
- $discussion .= '&previous='.$prevread;
+ $discussion .= '&previous='.$prevread;
}
$discussion .= &group_args($group);
- $discussion .= '">'.&mt('Export').'?</a> </td>';
+ $discussion .= '">'.&mt('Export').'</a>';
+ if ($seehidden) {
+ $discussion .= ' ';
+ $discussion .='<a href="/adm/feedback?undeleteall='.$escsymb;
+ if ($newpostsflag) {
+ $discussion .= '&previous='.$prevread;
+ }
+ $discussion .= &group_args($group);
+ $discussion .= '">'.&mt('Undelete all deleted entries').'</a>';
+ }
+ $discussion.='</td>';
if ($newpostsflag) {
if (!$markondisp) {
- $discussion .='<td align="right"><a href="/adm/preferences?action=changediscussions';
+ $discussion .='<td class="LC_disc_action_right"><a href="/adm/preferences?action=changediscussions';
$discussion .= &group_args($group);
$discussion .= '">'.
- &mt('Preferences on what is marked as NEW').
+ &mt('My general 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>';
+ $discussion .= '">'.&mt('Mark NEW posts no longer new').'</a></td>';
} else {
$discussion .= '<td> </td>';
}
@@ -795,28 +921,9 @@ sub action_links_bar {
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) = @_;
+ $currnewattach,$currdelold,$group,$crstype) = @_;
my $newattachmsg;
my %lt = &Apache::lonlocal::texthash(
'note' => 'Note: in anonymous discussion, your name is visible only to course faculty',
@@ -825,15 +932,28 @@ sub postingform_display {
'poan' => 'Post Anonymous Discussion',
'newa' => 'New attachments',
);
- my $postingform = (<<ENDDISCUSS);
+ if ($crstype eq 'Community') {
+ $lt{'note'} = &mt('Note: in anonymous discussion, your name is visible only to community facilitators');
+ }
+ my ($postingform,$textareaclass);
+ if (&Apache::lonhtmlcommon::htmlareabrowser()) {
+ $postingform = &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);
+ }
+ }
+ }
+ $postingform .= (<<ENDDISCUSS);
<form action="/adm/feedback" method="post" name="mailform" enctype="multipart/form-data"> <input type="submit" name="discuss" value="$lt{'podi'}" />
<input type="submit" name="anondiscuss" value="$lt{'poan'}" /> <input type="hidden" name="symb" value="$ressymb" />
<input type="hidden" name="sendit" value="true" />
<input type="hidden" name="timestamp" value="$now" />
-<br /><a name="newpost"></a>
+<a name="newpost"></a>
<font size="1">$lt{'note'}</font><br />
-<b>$lt{'title'}:</b> <input type="text" name="subject" value="$subject" size="30" /><br /><br />
-<textarea name="comment" cols="80" rows="14" wrap="hard">$comment</textarea>
+<b>$lt{'title'}:</b> <input type="text" name="subject" value="$subject" size="30" /><br />
+<textarea name="comment" cols="80" rows="14" id="comment" $textareaclass>$comment</textarea>
ENDDISCUSS
if ($env{'form.origpage'}) {
$postingform .= '<input type="hidden" name="origpage" value="'.
@@ -850,50 +970,81 @@ ENDDISCUSS
if ($group ne '') {
$postingform .='<input type="hidden" name="group" value="'.$group.'" />';
}
- my ($blockblog) = &blocking_posts('blogs');
+ my $blockblog = &Apache::loncommon::blocking_status('blogs');
if (!$blockblog) {
- $postingform .= &add_blog_checkbox();
+ $postingform .= &add_blog_checkbox($crstype);
}
$postingform .= "</form>\n";
- if ($outputtarget ne 'tex') {
- $postingform .= &generate_attachments_button('',$attachnum,$ressymb,
+ $postingform .= &generate_attachments_button('',$attachnum,$ressymb,
$now,$currnewattach,
$currdelold,'',$mode,
$blockblog);
- if ((ref($currnewattach) eq 'ARRAY') && (@{$currnewattach} > 0)) {
- $newattachmsg = '<br /><b>'.$lt{'newa'}.'</b><br />';
- if (@{$currnewattach} > 1) {
- $newattachmsg .= '<ol>';
- foreach my $item (@{$currnewattach}) {
- $item =~ m#.*/([^/]+)$#;
- $newattachmsg .= '<li><a href="'.$item.'">'.$1.'</a></li>'."\n";
- }
- $newattachmsg .= '</ol>'."\n";
- } else {
- $$currnewattach[0] =~ m#.*/([^/]+)$#;
- $newattachmsg .= '<a href="'.$$currnewattach[0].'">'.$1.'</a><br />'."\n";
- }
- }
- $postingform .= $newattachmsg;
- $postingform .= &generate_preview_button();
+ if ((ref($currnewattach) eq 'ARRAY') && (@{$currnewattach} > 0)) {
+ $newattachmsg = '<br /><b>'.$lt{'newa'}.'</b><br />';
+ if (@{$currnewattach} > 1) {
+ $newattachmsg .= '<ol>';
+ foreach my $item (@{$currnewattach}) {
+ $item =~ m#.*/([^/]+)$#;
+ $newattachmsg .= '<li><a href="'.$item.'">'.$1.'</a></li>'."\n";
+ }
+ $newattachmsg .= '</ol>'."\n";
+ } else {
+ $$currnewattach[0] =~ m#.*/([^/]+)$#;
+ $newattachmsg .= '<a href="'.$$currnewattach[0].'">'.$1.'</a><br />'."\n";
+ }
}
+ $postingform .= $newattachmsg;
+ $postingform .= &generate_preview_button();
return $postingform;
}
sub build_posting_display {
- my ($usernamesort,$subjectsort,$namesort,$notshown,$newitem,$dischash,$shown,$alldiscussion,$imsitems,$imsfiles,$roleinfo,$discussionitems,$replies,$depth,$posters,$maxdepth,$visible,$newpostsflag,$current,$status,$viewgrades,$seeid,$prevread,$sortposts,$ressymb,$target,$readkey,$showunmark,$showonlyunread,$totposters,$rolefilter,$sectionpick,$grouppick,$classgroups,$statusfilter,$toggkey,$outputtarget,$anonhash,$anoncnt,$group) = @_;
+ my ($usernamesort,$subjectsort,$namesort,$notshown,$newitem,$dischash,$shown,$alldiscussion,$imsitems,$imsfiles,$roleinfo,$discussionitems,$replies,$depth,$posters,$maxdepth,$visible,$newpostsflag,$current,$status,$viewgrades,$seeid,$seehidden,$canvote,$prevread,$sortposts,$ressymb,$readkey,$showunmark,$showonlyunread,$totposters,$rolefilter,$sectionpick,$grouppick,$classgroups,$statusfilter,$toggkey,$outputtarget,$anonhash,$anoncnt,$group) = @_;
my @original=();
my @index=();
my $skip_group_check = 0;
my $symb=&Apache::lonenc::check_decrypt($ressymb);
my $escsymb=&escape($ressymb);
+# These are the discussion contributions
my %contrib=&Apache::lonnet::restore($symb,$env{'request.course.id'},
$env{'course.'.$env{'request.course.id'}.'.domain'},
$env{'course.'.$env{'request.course.id'}.'.num'});
+ my (%likes,%userlikes,%userunlikes,@theselikes,$oneplus,$twoplus,$oneminus,$twominus);
+ my $thisuser=$env{'user.name'}.':'.$env{'user.domain'};
+ if ($seeid || $canvote) {
+# And these are the likes/unlikes
+ %likes=&Apache::lonnet::dump('disclikes',
+ $env{'course.'.$env{'request.course.id'}.'.domain'},
+ $env{'course.'.$env{'request.course.id'}.'.num'},
+ '^'.$symb.':');
+# Array with likes to figure out averages, etc.
+ @theselikes=();
+# Hashes containing likes and unlikes for this user.
+ %userlikes=();
+ %userunlikes=();
+ }
+# Is the user allowed to see the real name behind anonymous postings?
+ my $see_anonymous =
+ &Apache::lonnet::allowed('rin',$env{'request.course.id'}.($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''));
if ((@{$grouppick} == 0) || (grep(/^all$/,@{$grouppick}))) {
$skip_group_check = 1;
}
+# Deletions and hiddens are just lists. Split them up into a hash for quicker lookup
+ my (%deletions,%hiddens);
+ if ($contrib{'deleted'}) {
+ my $deleted = $contrib{'deleted'};
+ $deleted =~ s/^\.//;
+ $deleted =~ s/\.$//;
+ %deletions = map { $_ => 1 } (split(/\.\./,$deleted));
+ }
+ if ($contrib{'hidden'}) {
+ my $hidden = $contrib{'hidden'};
+ $hidden =~ s/^\.//;
+ $hidden =~ s/\.$//;
+ %hiddens = map { $_ => 1 } (split(/\.\./,$hidden));
+ }
+# Versions if store/restore are used to actually store the messages.
if ($contrib{'version'}) {
my $oldest = $contrib{'1:timestamp'};
if ($prevread eq '0') {
@@ -904,20 +1055,96 @@ sub build_posting_display {
($skiptest,$roleregexp,$secregexp,$statusregexp) =
&filter_regexp($rolefilter,$sectionpick,$statusfilter);
$rolematch = $roleregexp.':'.$secregexp.':'.$statusregexp;
- }
+ }
+ my %votestyle;
+ if ($seeid || $canvote) {
+# We need to go through this twice, first to get the likes/dislikes, then to actually build the display
+ for (my $id=1;$id<=$contrib{'version'};$id++) {
+ my $idx=$id;
+ next if ($contrib{$idx.':deleted'});
+ next if ($contrib{$idx.':hidden'});
+ unless ((($hiddens{$idx}) && (!$seehidden)) || ($deletions{$idx}) || (!$contrib{$idx.':message'})) {
+ push(@theselikes,$likes{$symb.':'.$idx.':likes'});
+ if ($likes{$symb.':'.$idx.':likes'} ne '') {
+ if (ref($likes{$symb.':'.$idx.':likers'}) eq 'HASH') {
+ if (exists($likes{$symb.':'.$idx.':likers'}{$thisuser})) {
+ $userlikes{$idx} = 1;
+ }
+ }
+ if (ref($likes{$symb.':'.$idx.':unlikers'}) eq 'HASH') {
+ if (exists($likes{$symb.':'.$idx.':unlikers'}{$thisuser})) {
+ $userunlikes{$idx} = 1;
+ }
+ }
+ }
+ }
+ }
+# Figure out average likes and standard deviation if there are enough
+# discussions to warrant that
+ my $ave=0;
+ my $stddev=10000;
+ if ($#theselikes>1) {
+ my $sum=0;
+ my $num=$#theselikes+1;
+ foreach my $thislike (@theselikes) {
+ $sum+=$thislike;
+ }
+ $ave=$sum/$num;
+ my $sumsq=0;
+ foreach my $thislike (@theselikes) {
+ $sumsq+=($thislike-$ave)*($thislike-$ave);
+ }
+ $stddev=sqrt($sumsq/$num);
+ }
+# Now we know the average likes $ave and the standard deviation $stddev
+# Get the boundaries for markup
+ $oneplus=$ave+$stddev;
+ $twoplus=$ave+2.*$stddev;
+ $oneminus=$ave-$stddev;
+ $twominus=$ave-2.*$stddev;
+ if ($#theselikes>1) {
+ foreach my $class ('twoplus','oneplus','zero','oneminus','twominus') {
+ my $fontstyle = $env{'course.'.$env{'request.course.id'}.'.discussion_post_fonts_'.$class};
+ if ($fontstyle ne '') {
+ my ($size,$weight,$style,$other) = split(/,/,$fontstyle);
+ if ($size ne '') {
+ $votestyle{$class} .= 'font-size: '.$size.';';
+ }
+ if ($weight ne '') {
+ $votestyle{$class} .= 'font-weight: '.$weight.';';
+ }
+ if ($style ne '') {
+ $votestyle{$class} .= 'font-style: '.$style.';';
+ }
+ if ($other ne '') {
+ $votestyle{$class} .= $other;
+ }
+ if ($votestyle{$class} ne '') {
+ $votestyle{$class} = 'style="'.$votestyle{$class}.'"';
+ }
+ }
+ }
+ }
+ }
+#
+# This is now the real loop. Go through all entries, pick up what we need
+#
for (my $id=1;$id<=$contrib{'version'};$id++) {
my $idx=$id;
+ next if ($contrib{$idx.':deleted'});
+ next if ($contrib{$idx.':hidden'});
+# If we get here, we are actually going to display the message - we don't know where and we don't know if we display
+# previous edits, but it counts as one entry
my $posttime = $contrib{$idx.':timestamp'};
if ($prevread <= $posttime) {
$$newpostsflag = 1;
}
- my $hidden=($contrib{'hidden'}=~/\.$idx\./);
my $studenthidden=($contrib{'studenthidden'}=~/\.$idx\./);
- my $deleted=($contrib{'deleted'}=~/\.$idx\./);
my $origindex='0.';
my $numoldver=0;
if ($contrib{$idx.':replyto'}) {
- if ( (($env{'environment.threadeddiscussion'}) && ($sortposts eq '')) || ($sortposts eq 'thread') || ($outputtarget eq 'export')) {
+ if ( ((!$env{'environment.unthreadeddiscussion'}) && ($sortposts eq '')) ||
+ ($sortposts eq 'thread') || ($outputtarget eq 'export')) {
# this is a follow-up message
$original[$idx]=$original[$contrib{$idx.':replyto'}];
$$depth[$idx]=$$depth[$contrib{$idx.':replyto'}]+1;
@@ -937,7 +1164,7 @@ sub build_posting_display {
} else {
$$replies[$$depth[$idx]]=1;
}
- unless ((($hidden) && (!$seeid)) || ($deleted)) {
+ unless ((($hiddens{$idx}) && (!$seehidden)) || ($deletions{$idx})) {
$$visible++;
if ($contrib{$idx.':history'}) {
if ($contrib{$idx.':history'} =~ /:/) {
@@ -952,7 +1179,7 @@ sub build_posting_display {
my %subjects = ();
my %attachtxt = ();
my %allattachments = ();
- my ($screenname,$plainname);
+ my ($screenname,$plainname,$showaboutme);
my $sender = &mt('Anonymous');
# Anonymous users getting number within a discussion
# Since idx is in static order, this should give the same sequence every time.
@@ -962,7 +1189,7 @@ sub build_posting_display {
$$anonhash{$key}=&mt('Anonymous').' '.$anoncnt;
}
my ($message,$subject,$vgrlink,$ctlink);
- &get_post_contents(\%contrib,$idx,$seeid,$outputtarget,\%messages,\%subjects,\%allattachments,\%attachtxt,$imsfiles,\$screenname,\$plainname,$numoldver);
+ &get_post_contents(\%contrib,$idx,$seeid,$seehidden,$outputtarget,\%messages,\%subjects,\%allattachments,\%attachtxt,$imsfiles,\$screenname,\$plainname,\$showaboutme,$numoldver);
# Set up for sorting by subject
@@ -971,7 +1198,7 @@ sub build_posting_display {
$message.=$attachtxt{$numoldver};
$subject=$subjects{$numoldver};
if ($message) {
- if ($hidden) {
+ if ($hiddens{$idx}) {
$message='<font color="#888888">'.$message.'</font>';
if ($studenthidden) {
$message .='<br /><br />Deleted by poster (student).';
@@ -991,18 +1218,27 @@ sub build_posting_display {
@{$$subjectsort{$subject}} = ("$idx");
}
}
- if ((!$contrib{$idx.':anonymous'}) || (&Apache::lonnet::allowed('rin',$env{'request.course.id'}.($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:'')))) {
- $sender=&Apache::loncommon::aboutmewrapper(
- $plainname,
- $contrib{$idx.':sendername'},
- $contrib{$idx.':senderdomain'}).' ('.
- $contrib{$idx.':sendername'}.' at '.
- $contrib{$idx.':senderdomain'}.')';
+ if (!$contrib{$idx.':anonymous'} || $see_anonymous) {
+ if ($showaboutme) {
+ $sender = &Apache::loncommon::aboutmewrapper(
+ $plainname,
+ $contrib{$idx.':sendername'},
+ $contrib{$idx.':senderdomain'});
+ } else {
+ $sender = $plainname;
+ }
+ if ($see_anonymous) {
+ $sender .= ' ('.$contrib{$idx.':sendername'}.':'.
+ $contrib{$idx.':senderdomain'}.')';
+ }
+ $sender = '<b>'.$sender.'</b>';
if ($contrib{$idx.':anonymous'}) {
$sender.=' <font color="red"><b>['.$$anonhash{$key}.']</b></font> '.
$screenname;
}
-
+ if ($see_anonymous) {
+ $sender.=&Apache::loncommon::student_image_tag($contrib{$idx.':senderdomain'},$contrib{$idx.':sendername'});
+ }
# Set up for sorting by domain, then username
unless (defined($$usernamesort{$contrib{$idx.':senderdomain'}})) {
%{$$usernamesort{$contrib{$idx.':senderdomain'}}} = ();
@@ -1032,53 +1268,47 @@ sub build_posting_display {
} else {
@{$$namesort{$lastname}{$firstname}} = ("$idx");
}
- if (&editing_allowed($escsymb.':::'.$idx,$group)) {
- if (($env{'user.domain'} eq $contrib{$idx.':senderdomain'}) && ($env{'user.name'} eq $contrib{$idx.':sendername'})) {
- $sender.=' <a href="/adm/feedback?editdisc='.
- $escsymb.':::'.$idx;
- if ($$newpostsflag) {
- $sender .= '&previous='.$prevread;
- }
- $sender .= &group_args($group);
- $sender .= '" '.$target.'>'.&mt('Edit').'</a>';
-
- unless ($seeid) {
- my $grpargs = &group_args($group);
- $sender.=" <a href=\"javascript:verifydelete('studentdelete','$escsymb','$idx','$$newpostsflag','$prevread','$grpargs')";
- $sender .= '">'.&mt('Delete').'</a>';
- }
+ if ($outputtarget ne 'tex') {
+# Add karma stars
+ my $karma=&userkarma($contrib{$idx.':sendername'},$contrib{$idx.':senderdomain'});
+ for (my $i=1;$i<=$karma;$i++) {
+ $sender.='<img border="0" src="/res/adm/pages/star.gif" alt="'.&mt('Contributor Kudos').'" />';
}
- }
- if ($seeid) {
- if ($hidden) {
- unless ($studenthidden) {
- $sender.=' <a href="/adm/feedback?unhide='.
- $escsymb.':::'.$idx;
- if ($$newpostsflag) {
- $sender .= '&previous='.$prevread;
+# Can people edit this?
+ if (&editing_allowed($escsymb.':::'.$idx,$group)) {
+ if (($env{'user.domain'} eq $contrib{$idx.':senderdomain'}) && ($env{'user.name'} eq $contrib{$idx.':sendername'})) {
+ $sender.=' '.
+ &discussion_link($symb,&mt('Edit'),'editdisc',$idx,$$newpostsflag,$prevread,&group_args($group));
+ unless ($seehidden) {
+ my $grpargs = &group_args($group);
+ $sender.=" <a href=\"javascript:verifydelete('studentdelete','$escsymb','$idx','$$newpostsflag','$prevread','$grpargs')";
+ $sender .= '">'.&mt('Delete').'</a>';
}
- $sender .= '">'.&mt('Make Visible').'</a>';
}
- } else {
- $sender.=' <a href="/adm/feedback?hide='.
- $escsymb.':::'.$idx;
- if ($$newpostsflag) {
- $sender .= '&previous='.$prevread;
- }
- $sender .= &group_args($group);
- $sender .= '">'.&mt('Hide').'</a>';
- }
- my $grpargs = &group_args($group);
- $sender.=
- " <a href=\"javascript:verifydelete('seeiddelete','$escsymb','$idx','$$newpostsflag','$prevread','$grpargs')\">";
- $sender .= &mt('Delete').'</a>';
+ }
+ if ($seehidden) {
+ if ($hiddens{$idx}) {
+ unless ($studenthidden) {
+ $sender.=' '.
+ &discussion_link($symb,&mt('Make Visible'),'unhide',$idx,$$newpostsflag,$prevread,&group_args($group));
+ }
+ } else {
+ $sender.=' '.
+ &discussion_link($symb,&mt('Hide'),'hide',$idx,$$newpostsflag,$prevread,&group_args($group));
+ }
+ my $grpargs = &group_args($group);
+ $sender.=
+ " <a href=\"javascript:verifydelete('seeiddelete','$escsymb','$idx','$$newpostsflag','$prevread','$grpargs')\">";
+ $sender .= &mt('Delete').'</a>';
+ }
}
- } else {
+ } else {
if ($screenname) {
$sender='<i>'.$screenname.'</i>';
} else {
$sender='<i>'.$$anonhash{$key}.'</i>';
}
+ $sender = '<b>'.$sender.'</b>';
# Set up for sorting by domain, then username for anonymous
unless (defined($$usernamesort{'__anon'})) {
%{$$usernamesort{'__anon'}} = ();
@@ -1098,43 +1328,37 @@ sub build_posting_display {
@{$$namesort{'__anon'}{'__anon'}} = ("$idx");
}
}
- if (&discussion_open($status)) {
- if (($group ne '') &&
- (&check_group_priv($group,'pgd') eq 'ok')) {
- $sender.=' <a href="/adm/feedback?replydisc='.
- $escsymb.':::'.$idx;
- if ($$newpostsflag) {
- $sender .= '&previous='.$prevread;
- }
- $sender .= &group_args($group);
- $sender .= '" '.$target.'>'.&mt('Reply').'</a>';
- } elsif (&Apache::lonnet::allowed('pch',
- $env{'request.course.id'}.
- ($env{'request.course.sec'}?'/'.
- $env{'request.course.sec'}:''))) {
- $sender.=' <a href="/adm/feedback?replydisc='.
- $escsymb.':::'.$idx;
- if ($$newpostsflag) {
- $sender .= '&previous='.$prevread;
+ if ($outputtarget ne 'tex') {
+ if (&discussion_open($status)) {
+ if (($group ne '') &&
+ (&check_group_priv($group,'pgd') eq 'ok')) {
+ $sender.=' '.
+ &discussion_link($symb,&mt('Reply'),'replydisc',$idx,$$newpostsflag,$prevread,&group_args($group));
+ } elsif (&Apache::lonnet::allowed('pch',
+ $env{'request.course.id'}.
+ ($env{'request.course.sec'}?'/'.
+ $env{'request.course.sec'}:''))) {
+ $sender.=' '.
+ &discussion_link($symb,&mt('Reply'),'replydisc',$idx,$$newpostsflag,$prevread);
}
- $sender .= '" '.$target.'>'.&mt('Reply').'</a>';
}
- }
- if ($viewgrades) {
- $vgrlink=&Apache::loncommon::submlink('Submissions',
- $contrib{$idx.':sendername'},$contrib{$idx.':senderdomain'},$ressymb);
- }
- if ($$dischash{$readkey}=~/\.$idx\./) {
- $ctlink = '<label><b>'.&mt('Mark unread').'?</b> <input type="checkbox" name="postunread_'.$idx.'" /></label>';
- } else {
- $ctlink = '<label><b>'.&mt('Mark read').'?</b> <input type="checkbox" name="postread_'.$idx.'" /></label>';
+ if ($viewgrades) {
+ $vgrlink=&Apache::loncommon::submlink(&mt('Submissions'),
+ $contrib{$idx.':sendername'},$contrib{$idx.':senderdomain'},$ressymb);
+ }
+ if ($$dischash{$readkey}=~/\.$idx\./) {
+ $ctlink = '<label><b>'.&mt('Mark unread').'?</b> <input type="checkbox" name="postunread_'.$idx.'" /></label>';
+ } else {
+ $ctlink = '<label><b>'.&mt('Mark read').'?</b> <input type="checkbox" name="postread_'.$idx.'" /></label>';
+ }
}
}
#figure out at what position this needs to print
}
if ($outputtarget eq 'export' || $message) {
my $thisindex=$idx;
- if ( (($env{'environment.threadeddiscussion'}) && ($sortposts eq '')) || ($sortposts eq 'thread') || ($outputtarget eq 'export')) {
+ if ( ((!$env{'environment.unthreadeddiscussion'}) && ($sortposts eq '')) ||
+ ($sortposts eq 'thread') || ($outputtarget eq 'export')) {
$thisindex=$origindex.substr('00'.$$replies[$$depth[$idx]],-2,2);
}
$$alldiscussion{$thisindex}=$idx;
@@ -1144,7 +1368,7 @@ sub build_posting_display {
if ($outputtarget eq 'export') {
%{$$imsitems{$idx}} = ();
$$imsitems{$idx}{'isvisible'}='true';
- if ($hidden) {
+ if ($hiddens{$idx}) {
$$imsitems{$idx}{'isvisible'}='false';
}
$$imsitems{$idx}{'title'}=$subjects{$numoldver};
@@ -1152,7 +1376,7 @@ sub build_posting_display {
$$imsitems{$idx}{'attach'}=$attachtxt{$numoldver};
$$imsitems{$idx}{'timestamp'}=$contrib{$idx.':timestamp'};
$$imsitems{$idx}{'sender'}=$plainname.' ('.
- $contrib{$idx.':sendername'}.' at '.
+ $contrib{$idx.':sendername'}.':'.
$contrib{$idx.':senderdomain'}.')';
$$imsitems{$idx}{'isanonymous'}='false';
if ($contrib{$idx.':anonymous'}) {
@@ -1166,14 +1390,15 @@ sub build_posting_display {
} else {
if ($message) {
my $spansize = 2;
+ my ($uname,$udom);
if ($showonlyunread && $prevread > $posttime) {
$$notshown{$idx} = 1;
} elsif ($showunmark && $$dischash{$readkey}=~/\.$idx\./) {
$$notshown{$idx} = 1;
} else {
# apply filters
- my $uname = $contrib{$idx.':sendername'};
- my $udom = $contrib{$idx.':senderdomain'};
+ $uname = $contrib{$idx.':sendername'};
+ $udom = $contrib{$idx.':senderdomain'};
my $poster = $uname.':'.$udom;
if ($env{'form.totposters'} ne '') {
if ($totposters == 0) {
@@ -1224,32 +1449,86 @@ sub build_posting_display {
unless ($$notshown{$idx} == 1) {
if ($prevread > 0 && $prevread <= $posttime) {
$$newitem{$idx} = 1;
- $$discussionitems[$idx] .= '
- <p><table border="0" width="100%">
- <tr><td align="left"><font color="#FF0000"><b>NEW</b></font></td>';
+ $$discussionitems[$idx] .= '<font color="#FF0000"><b>'.&mt('NEW').' </b></font>';
} else {
$$newitem{$idx} = 0;
- $$discussionitems[$idx] .= '
- <p><table border="0" width="100%">
- <tr><td align="left"> </td>';
- }
- $$discussionitems[$idx] .= '<td align ="left"> '.
- '<b>'.$subject.'</b> '.
- $sender.'</b> '.$vgrlink.' ('.
- &Apache::lonlocal::locallocaltime($posttime).')</td>';
+ }
+ $$discussionitems[$idx] .= '<b>'.$subject.'</b> '.
+ $sender.' '.$vgrlink.' ('.
+ &Apache::lonlocal::locallocaltime($posttime).')';
if ($$dischash{$toggkey}) {
- $$discussionitems[$idx].='<td align="right"> '.
- $ctlink.'</td>';
+ $$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};
+ }
+# Actually glue in the message itself
+ $$discussionitems[$idx].= '<br /><blockquote>'.
+ "<div $likestyle>".
+ $message.
+ '</div></blockquote>';
+ 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.');
+ }
+ $$discussionitems[$idx].=
+ '<a href="javascript:alert('."'$novote'".');" style="text-decoration: none;">'.
+ '<img border="0" src="/res/adm/pages/thumbsup_novote.png" alt="'.$novote.'" /> '.
+ '<img border="0" src="/res/adm/pages/thumbsdown_novote.png" alt="'.$novote.'" /></a>';
+
+ } else {
+ if ($userlikes{$idx}) {
+ $$discussionitems[$idx].='<img border="0" src="/res/adm/pages/thumbsup_gray.png" alt="'.&mt('You like this posting').'" />';
+ } else {
+ $$discussionitems[$idx].=' '.&discussion_link($symb,'<img border="0" src="/res/adm/pages/thumbsup.png" alt="'.&mt('Like').'" />','like',$idx,$$newpostsflag,$prevread,&group_args($group),&mt("Like this posting"));
+ }
+ if ($userunlikes{$idx}) {
+ $$discussionitems[$idx].='<img border="0" src="/res/adm/pages/thumbsdown_gray.png" alt="'.&mt('You unlike this posting').'" />';
+ } else {
+ $$discussionitems[$idx].=' '.&discussion_link($symb,'<img border="0" src="/res/adm/pages/thumbsdown.png" alt="'.&mt('Unlike').'" />','unlike',$idx,$$newpostsflag,$prevread,&group_args($group),&mt("Unlike this posting"));
+ }
+ }
+ }
+ if ($seeid || $canvote) {
+ my $thislikes=$likes{$symb.':'.$idx.':likes'};
+ if ($thislikes>0) {
+ $$discussionitems[$idx].=' ('.&mt("[_1] likes",$thislikes).')';
+ } elsif ($thislikes<0) {
+ $$discussionitems[$idx].=' ('.&mt("[_1] unlikes",abs($thislikes)).')';
+ }
}
- $$discussionitems[$idx].= '</tr></table><blockquote>'.
- $message.'</blockquote></p>';
+# If there is any history to this post, inform the reader
if ($contrib{$idx.':history'}) {
my @postversions = ();
- $$discussionitems[$idx] .= &mt('This post has been edited by the author.');
- if ($seeid) {
- $$discussionitems[$idx] .= ' <a href="/adm/feedback?allversions='.$escsymb.':::'.$idx;
- $$discussionitems[$idx] .= &group_args($group);
- $$discussionitems[$idx] .= '">'.&mt('Display all versions').'</a>';
+ $$discussionitems[$idx] .= ' '.&mt('This post has been edited by the author.');
+ if ($seehidden) {
+ $$discussionitems[$idx] .= ' '.
+ &discussion_link($symb,&mt('Display all versions'),'allversions',$idx,$$newpostsflag,$prevread,&group_args($group));
}
$$discussionitems[$idx].='<br/>'.&mt('Earlier version(s) were posted on: ');
if ($contrib{$idx.':history'} =~ m/:/) {
@@ -1262,12 +1541,19 @@ sub build_posting_display {
$$discussionitems[$idx] .= '<b>'.$version.'.</b> - '.&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 {
@@ -1326,13 +1612,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;
}
@@ -1344,13 +1630,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') {
@@ -1377,7 +1670,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/\<br \/\>/g;
$$subjects{$i}=&Apache::lontexconvert::msgtexconverted($$subjects{$i});
@@ -1391,7 +1686,7 @@ sub get_post_contents {
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";
+ $$imsfiles{$idx}{$i} .= '<file href="'.$fname.'" />'."\n";
$$attachtxt{$i}.= '<a href="'.$fname.'">'.$4.'</a><br />';
}
}
@@ -1458,20 +1753,23 @@ sub replicate_attachments {
}
sub mail_screen {
- my ($r,$feedurl,$options) = @_;
+ my ($r,$feedurl,$options,$caller_symb,$attachmaxtext) = @_;
if (exists($env{'form.origpage'})) {
&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:',
+ 'myqu' => 'Question/comment/feedback:',
'title' => 'Title',
'reta' => 'Retained attachments',
- 'atta' => 'Attachment (128 KB max size)',
- );
- my $title=&Apache::lonnet::gettitle($feedurl);
- if (!$title) { $title = $feedurl; }
+ 'atta' => 'Attachment',
+ );
+ if($env{'form.editdisc'} || $env{'form.replydisc'}){
+ %lt = &Apache::lonlocal::texthash(
+ 'myqu' => 'Post Discussion',
+ );
+ }
+ my $restitle = &get_resource_title($caller_symb,$feedurl);
my $quote='';
my $subject = '';
my $comment = '';
@@ -1535,6 +1833,7 @@ END
$env{'course.'.$env{'request.course.id'}.'.domain'},
$env{'course.'.$env{'request.course.id'}.'.num'});
unless (($contrib{'hidden'}=~/\.$idx\./) || ($contrib{'deleted'}=~/\.$idx\./)) {
+ my $numoldver = 0;
if ($contrib{$idx.':history'}) {
if ($contrib{$idx.':history'} =~ /:/) {
my @oldversions = split(/:/,$contrib{$idx.':history'});
@@ -1543,36 +1842,25 @@ END
$numoldver = 1;
}
}
- if ($env{'form.replydisc'}) {
- if ($contrib{$idx.':history'}) {
- if ($contrib{$idx.':history'} =~ /:/) {
- my @oldversions = split(/:/,$contrib{$idx.':history'});
- $numoldver = @oldversions;
- } else {
- $numoldver = 1;
- }
+ if ($idx > 0) {
+ my (%msgversions,%subversions,$htmldecode);
+ $htmldecode = 0;
+ if ($env{'form.replydisc'}) {
+ $htmldecode = 1;
}
- 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};
- }
- if ($idx > 0) {
- my %subversions = ();
- &get_post_versions(\%subversions,$contrib{$idx.':subject'},1,$numoldver);
- $subject = &mt('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);
+ $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'};
}
@@ -1605,7 +1893,7 @@ 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.');
my $js= <<END;
@@ -1647,23 +1935,51 @@ END
</script>
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') { '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 '') {
- &newline_to_br(\$quote);
- $quote='<blockquote>'.&Apache::lontexconvert::msgtexconverted($quote).'</blockquote>';
+ $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="<h2><tt>$restitle</tt></h2>";
}
-
$r->print(<<END);
$start_page
-<h2><tt>$title</tt></h2>
+<h1>$lt{'myqu'}</h1>
+$header
<form action="/adm/feedback" method="post" name="mailform"
enctype="multipart/form-data">
$prevtag
<input type="hidden" name="postdata" value="$feedurl" />
+<input type="hidden" name="modal" value="$env{'form.modal'}" />
END
if ($env{'form.replydisc'}) {
$r->print(<<END);
@@ -1671,23 +1987,38 @@ END
END
} elsif ($env{'form.editdisc'}) {
$r->print(<<END);
-<input type="hidden" name="editdisc" value ="$env{'form.editdisc'}" />
-<input type="hidden" name="parentmsg" value ="$parentmsg" />
+<input type="hidden" name="editdisc" value="$env{'form.editdisc'}" />
+<input type="hidden" name="parentmsg" value="$parentmsg" />
END
}
$r->print(<<END);
-$lt{'plch'}
-$options<hr />
+$options
+<br />
+END
+$r->print(&Apache::lonhtmlcommon::start_pick_box());
+$r->print(<<END);
$quote
-<p>$lt{'myqu'}</p>
<p>
-$latexHelp
-$lt{'title'}: <input type="text" name="subject" size="30" value="$subject" /></p>
+$textareaheader
+</p>
<p>
-<textarea name="comment" id="comment" cols="60" rows="10" wrap="hard">$comment
-</textarea></p>
+$latexHelp
+</p>
<p>
END
+
+
+ $r->print(&Apache::lonhtmlcommon::row_title(&mt('Subject')));
+ $r->print('<input type="text" name="subject" size="30" value="'.
+ $subject.'" /></p>');
+ $r->print(&Apache::lonhtmlcommon::row_closure());
+ $r->print(&Apache::lonhtmlcommon::row_title(&mt('Message')));
+ $r->print('<textarea name="comment" id="comment" cols="55" rows="10" '.
+ $textareaclass.'>'.$comment.
+ '</textarea>');
+ $r->print(&Apache::lonhtmlcommon::row_closure(1));
+ $r->print(&Apache::lonhtmlcommon::end_pick_box());
+
if ( ($env{'form.editdisc'}) || ($env{'form.replydisc'}) ) {
if ($env{'form.origpage'}) {
foreach my $attach (@currnewattach) {
@@ -1708,7 +2039,8 @@ END
}
} else {
$r->print(<<END);
-$lt{'atta'}: <input type="file" name="attachment" />
+<p>
+$lt{'atta'} $attachmaxtext: <input type="file" name="attachment" />
</p>
END
}
@@ -1719,15 +2051,14 @@ END
$r->print('<input type="hidden" name="ref" value="'.$env{'form.ref'}.'" />');
}
$r->print(<<END);
-<p>
<input type="hidden" name="sendit" value="1" />
-<input type="button" value="$send" onClick='gosubmit();' />
-</p>
+<input type="button" value="$send" onclick='gosubmit();' />
</form>
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;
@@ -1735,8 +2066,7 @@ END
if (@currnewattach > 0) {
$attachnum += @currnewattach;
}
- my ($blockblog) = &blocking_posts('blogs');
- $r->print(&generate_attachments_button($postidx,$attachnum,$ressymb,$now,\@currnewattach,\@currdelold,$numoldver,'',$blockblog));
+ my $blockblog = &Apache::loncommon::blocking_status('blogs');
if ($attachnum > 0) {
if (@currnewattach > 0) {
$newattachmsg .= '<br /><b>'.&mt('New attachments').'</b><br />';
@@ -1756,12 +2086,12 @@ END
$r->print("<br /><b>$lt{'reta'}</b>:$attachmsg<br />\n");
}
if ($newattachmsg) {
- $r->print("$newattachmsg<br />");
+ $r->print("$newattachmsg");
}
}
+ $r->print(&generate_attachments_button($postidx,$attachnum,$ressymb,$now,\@currnewattach,\@currdelold,$numoldver,'',$blockblog));
}
$r->print(&generate_preview_button().
- &Apache::lonhtmlcommon::htmlareaselectactive('comment').
&Apache::loncommon::end_page());
}
@@ -1781,14 +2111,14 @@ sub print_display_options {
'actn' => 'Action',
'deff' => 'Default for all discussions',
'prca' => 'Preferences can be set for this discussion that determine ....',
- 'whpo' => 'Which posts are displayed when you display this bulletin board or resource, and',
+ 'whpo' => 'Which posts are displayed when you display this discussion board or resource, and',
'unwh' => 'Under what circumstances posts are identified as "NEW", and',
'wipa' => 'Whether individual posts can be marked as read/unread',
'allposts' => 'All posts',
'unread' => 'New posts only',
'unmark' => 'Posts not marked read',
'ondisp' => 'Once displayed',
- 'onmark' => 'Once marked not NEW ',
+ 'onmark' => 'Once marked not NEW',
'toggon' => 'Shown',
'toggoff' => 'Not shown',
'disa' => 'Posts displayed?',
@@ -1911,7 +2241,7 @@ END
&Apache::loncommon::end_page();
$r->print(<<END);
$start_page
-<form name="modifydisp" method="POST" action="/adm/feedback">
+<form name="modifydisp" method="post" action="/adm/feedback">
$lt{'sdpf'}<br/> $lt{'prca'} <ol><li>$lt{'whpo'}</li><li>$lt{'unwh'}</li><li>$lt{'wipa'}</li></ol>
<br />
END
@@ -1927,9 +2257,9 @@ END
$r->print(<<END);
<td>$lt{'disa'}</td>
<td>$lt{$discdisp}</td>
- <td><label><input type="checkbox" name="discdisp" onClick="discdispChk('0')" /> $lt{'chgt'} "$dispchangeA"</label>
+ <td><label><input type="checkbox" name="discdisp" onclick="discdispChk('0')" /> $lt{'chgt'} "$dispchangeA"</label>
<br />
- <label><input type="checkbox" name="discdisp" onClick="discdispChk('1')" /> $lt{'chgt'} "$dispchangeB"</label>
+ <label><input type="checkbox" name="discdisp" onclick="discdispChk('1')" /> $lt{'chgt'} "$dispchangeB"</label>
</td>
END
$r->print(&Apache::loncommon::end_data_table_row());
@@ -1944,8 +2274,9 @@ END
$r->print(<<END);
<td>$lt{'dotm'}</td>
<td>$lt{$disctogg}</td>
- <td><label><input type="checkbox" name="disctogg" onClick="discdispChk('2')" />$lt{'chgt'} "$toggchange"</label></td>
+ <td><label><input type="checkbox" name="disctogg" onclick="discdispChk('2')" />$lt{'chgt'} "$toggchange"</label></td>
END
+ my $save = &mt('Save');
$r->print(&Apache::loncommon::end_data_table_row());
$r->print(&Apache::loncommon::end_data_table());
$r->print(<<END);
@@ -1953,11 +2284,11 @@ END
<br />
<input type="hidden" name="symb" value="$symb" />
<input type="hidden" name="previous" value="$previous" />
-<input type="hidden" name="$dispchgA" value=""/>
-<input type="hidden" name="$dispchgB" value=""/>
-<input type="hidden" name="$markchg" value=""/>
+<input type="hidden" name="$dispchgA" value="" />
+<input type="hidden" name="$dispchgB" value="" />
+<input type="hidden" name="$markchg" value="" />
<input type="hidden" name="$toggchg" value="" />
-<input type="button" name="sub" value="Store Changes" onClick="javascript:setDisp()" />
+<input type="button" name="sub" value="$save" onclick="javascript:setDisp()" />
END
if (exists($env{'form.group'})) {
$r->print('<input type="hidden" name="group" value="'.$env{'form.group'}.'" />');
@@ -1988,7 +2319,14 @@ sub print_sortfilter_options {
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;
@@ -2045,13 +2383,13 @@ sub print_sortfilter_options {
'spgr' => 'Specific groups',
'psub' => 'Pick specific users (by name)',
'shal' => 'Show a list of current posters',
- 'stor' => 'Store changes',
+ '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 = <<END;
<script type="text/javascript">
@@ -2098,22 +2436,22 @@ END
$r->print(<<END);
$start_page
-<form name="modifyshown" method="POST" action="/adm/feedback">
+<form name="modifyshown" method="post" action="/adm/feedback">
<b>$lt{'diso'}</b><br/> $lt{'prca'}
-<br /><br />
+<br />
<table border="0">
<tr>
- <td><b>$lt{'soor'}</b></td>
- <td> </td>
- <td><b>$lt{'sprs'}</b></td>
- <td> </td>
- <td><b>$lt{'spur'}</b></td>
- <td> </td>
- <td><b>$lt{'spse'}</b></td>
- <td> </td>
- <td><b>$lt{'spgr'}</b></td>
- <td> </td>
- <td><b>$lt{'psub'}</b></td>
+ <th>$lt{'soor'}</th>
+ <th> </th>
+ <th>$lt{'sprs'}</th>
+ <th> </th>
+ <th>$lt{'spur'}</th>
+ <th> </th>
+ <th>$lt{'spse'}</th>
+ <th> </th>
+ <th>$lt{'spgr'}</th>
+ <th> </th>
+ <th>$lt{'psub'}</th>
</tr>
<tr>
<td align="center" valign="top">
@@ -2137,25 +2475,26 @@ $start_page
</td>
<td> </td>
<td align="center" valign="top">
- <select name="rolefilter" multiple="true" size="5">
+ <select name="rolefilter" multiple="multiple" size="5">
<option value="all">$role_types{'all'}</option>
<option value="st">$role_types{'st'}</option>
- <option value="cc">$role_types{'cc'}</option>
+ <option value="$ccrole">$role_types{$ccrole}</option>
<option value="in">$role_types{'in'}</option>
<option value="ta">$role_types{'ta'}</option>
<option value="ep">$role_types{'ep'}</option>
+ <option value="ad">$role_types{'ad'}</option>
<option value="cr">$role_types{'cr'}</option>
</select>
</td>
<td> </td>
<td align="center" valign="top">
- <select name="sectionpick" multiple="true" size="$numvisible">
+ <select name="sectionpick" multiple="multiple" size="$numvisible">
$section_sel
</select>
</td>
<td> </td>
<td align="center" valign="top">
- <select name="grouppick" multiple="true" size="$numvisible">
+ <select name="grouppick" multiple="multiple" size="$numvisible">
$group_sel
</select>
</td>
@@ -2164,10 +2503,11 @@ $start_page
</tr>
</table>
<br />
-<br />
+<input type="hidden" name="inhibitmenu" value="$env{'form.inhibitmenu'}" />
+<input type="hidden" name="modal" value="$env{'form.modal'}" />
<input type="hidden" name="previous" value="$previous" />
<input type="hidden" name="applysort" value="$symb" />
-<input type="button" name="sub" value="$lt{'stor'}" 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'}.'" />');
@@ -2190,24 +2530,11 @@ 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;
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
my $group = $env{'form.group'};
my $ressymb = &wrap_symb($symb);
- if (($group ne '') &&
- ($ressymb =~ m|^bulletin___ \d+___adm/wrapper/adm/\Q$cdom\E/\Q$cnum\E/\d+/bulletinboard$|)) {
- if (&check_group_priv($group,'dgp') eq 'ok') {
- $seeid = 1;
- }
- } else {
- $seeid=&Apache::lonnet::allowed('rin',$crs);
- }
+ my $seehidden = &can_see_hidden('',$ressymb,$feedurl,$group,$cdom,$cnum);
my %contrib=&Apache::lonnet::restore($symb,$env{'request.course.id'},
$cdom,$cnum);
my %namesort = ();
@@ -2223,7 +2550,7 @@ sub print_showposters {
for (my $idx=1;$idx<=$contrib{'version'};$idx++) {
my $hidden=($contrib{'hidden'}=~/\.$idx\./);
my $deleted=($contrib{'deleted'}=~/\.$idx\./);
- unless ((($hidden) && (!$seeid)) || ($deleted)) {
+ 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'};
@@ -2248,7 +2575,7 @@ sub print_showposters {
}
}
}
- }
+ }
}
my $start_page = &Apache::loncommon::start_page('Discussion options');
@@ -2289,8 +2616,9 @@ END
$r->print(<<END);
<br />
<input type="hidden" name="sortposts" value="$sortposts" />
+<input type="hidden" name="modal" value="$env{'form.modal'}" />
<input type="hidden" name="userpick" value="$symb" />
-<input type="button" name="store" value="Display posts" onClick="javascript:document.pickpostersform.submit()" />
+<input type="button" name="store" value="Display posts" onclick="javascript:document.pickpostersform.submit()" />
</form>
$end_page
END
@@ -2362,7 +2690,7 @@ sub fail_redirect {
my ($r,$feedurl) = @_;
if ($feedurl=~/^\/adm\//) { $feedurl.='?register=1' };
my %lt = &Apache::lonlocal::texthash(
- 'sorr' => 'Sorry, no recipients ...',
+ 'sorr' => 'Sorry, no recipients ...',
);
my $logo=&Apache::loncommon::lonhttpdurl('/adm/lonIcons/lonlogos.gif');
$r->print(&Apache::loncommon::start_page('Feedback not sent',undef,
@@ -2370,13 +2698,13 @@ sub fail_redirect {
'only_body' => 1,}));
$r->print(<<ENDFAILREDIR);
<img align="right" src="$logo" />
-<b>$lt{'sorr'}</b>
+<p class="LC_warning">$lt{'sorr'}</p>
ENDFAILREDIR
$r->print(&Apache::loncommon::end_page());
}
sub redirect_back {
- my ($r,$feedurl,$typestyle,$sendsomething,$sendposts,$blog,$status,$previous,$sort,$rolefilter,$statusfilter,$sectionpick,$grouppick,$numpicks,$group) = @_;
+ my ($r,$feedurl,$typestyle,$sendsomething,$sendposts,$blog,$status,$previous,$sort,$rolefilter,$statusfilter,$sectionpick,$grouppick,$numpicks,$group,$toolarge) = @_;
my $sorttag = '';
my $roletag = '';
my $statustag = '';
@@ -2393,7 +2721,7 @@ sub redirect_back {
if ($previous > 0) {
$qrystr = 'previous='.$previous;
if ($feedurl =~ /\?register=1/) {
- $feedurl .= '&'.$qrystr;
+ $feedurl .= '&'.$qrystr;
} else {
$feedurl .= '?'.$qrystr;
}
@@ -2402,18 +2730,18 @@ sub redirect_back {
if (defined($sort)) {
my $sortqry = 'sortposts='.$sort;
if (($feedurl =~ /\?register=1/) || ($feedurl =~ /\?previous=/)) {
- $feedurl .= '&'.$sortqry;
+ $feedurl .= '&'.$sortqry;
} else {
$feedurl .= '?'.$sortqry;
}
$sorttag = '<input type="hidden" name="sortposts" value="'.$sort.'" />';
if (defined($numpicks)) {
my $userpickqry = 'totposters='.$numpicks;
- $feedurl .= '&'.$userpickqry;
+ $feedurl .= '&'.$userpickqry;
$userpicktag = '<input type="hidden" name="totposters" value="'.$numpicks.'" />';
} else {
if (ref($sectionpick) eq 'ARRAY') {
- $feedurl .= '§ionpick=';
+ $feedurl .= '&sectionpick=';
$sectag .= '<input type="hidden" name="sectionpick" value="';
foreach my $sec (@{$sectionpick}) {
$feedurl .= $sec.',';
@@ -2423,11 +2751,11 @@ sub redirect_back {
$sectag =~ s/,$//;
$sectag .= '" />';
} else {
- $feedurl .= '§ionpick='.$sectionpick;
+ $feedurl .= '&sectionpick='.$sectionpick;
$sectag = '<input type="hidden" name="sectionpick" value="'.$sectionpick.'" />';
}
if (ref($grouppick) eq 'ARRAY') {
- $feedurl .= '&grouppick=';
+ $feedurl .= '&grouppick=';
$sectag .= '<input type="hidden" name="grouppick" value="';
foreach my $grp (@{$grouppick}) {
$feedurl .= $grp.',';
@@ -2437,11 +2765,11 @@ sub redirect_back {
$grptag =~ s/,$//;
$grptag .= '" />';
} else {
- $feedurl .= '&grouppick='.$grouppick;
+ $feedurl .= '&grouppick='.$grouppick;
$grptag = '<input type="hidden" name="grouppick" value="'.$grouppick.'" />';
}
if (ref($rolefilter) eq 'ARRAY') {
- $feedurl .= '&rolefilter=';
+ $feedurl .= '&rolefilter=';
$roletag .= '<input type="hidden" name="rolefilter" value="';
foreach my $role (@{$rolefilter}) {
$feedurl .= $role.',';
@@ -2451,16 +2779,17 @@ sub redirect_back {
$roletag =~ s/,$//;
$roletag .= '" />';
} else {
- $feedurl .= '&rolefilter='.$rolefilter;
+ $feedurl .= '&rolefilter='.$rolefilter;
$roletag = '<input type="hidden" name="rolefilter" value="'.$rolefilter.'" />';
}
- $feedurl .= '&statusfilter='.$statusfilter;
+ $feedurl .= '&statusfilter='.$statusfilter;
$statustag ='<input type="hidden" name="statusfilter" value="'.$statusfilter.'" />';
}
}
my $grouptag;
if ($group ne '') {
- $grouptag = '<input type="hidden" name="group" value="'.$group.'" />'; my $refarg;
+ $grouptag = '<input type="hidden" name="group" value="'.$group.'" />';
+ my $refarg;
if (exists($env{'form.ref'})) {
$refarg = '&ref='.$env{'form.ref'};
$grouptag .= '<input type="hidden" name="ref" value="'.$env{'form.ref'}.'" />';
@@ -2471,18 +2800,16 @@ sub redirect_back {
$feedurl .= '?group='.$group.$refarg;
}
}
- $feedurl=&Apache::lonenc::check_encrypt($feedurl);
+ &Apache::lonenc::check_encrypt(\$feedurl);
my $logo=&Apache::loncommon::lonhttpdurl('/adm/lonIcons/lonlogos.gif');
- my %onload;
- if ($env{'environment.remote'} ne 'off') {
- $onload{'onload'} =
- "if (window.name!='loncapaclient') { this.document.reldt.submit(); self.window.close(); }";
+ my %parms=('only_body' => 1);
+ if ($env{'form.modal'}) {
+ $parms{'add_entries'}={'onLoad' => 'document.forms.reldt.submit()'};
+ } else {
+ $parms{'redirect'}=[0,$feedurl];
}
my $start_page=
- &Apache::loncommon::start_page('Feedback sent',undef,
- {'redirect' => [0,$feedurl],
- 'only_body' => 1,
- 'add_entries' => \%onload});
+ &Apache::loncommon::start_page('Feedback sent',undef,\%parms);
my $end_page = &Apache::loncommon::end_page();
$r->print(<<ENDREDIR);
$start_page
@@ -2490,6 +2817,7 @@ $start_page
$typestyle
<b>Sent $sendsomething message(s), and $sendposts post(s).</b>
$blog
+$toolarge
<font color="red">$status</font>
<form name="reldt" action="$feedurl" target="loncapaclient">
$prevtag
@@ -2507,20 +2835,16 @@ ENDREDIR
sub no_redirect_back {
my ($r,$feedurl) = @_;
- my $nofeed=&mt('Sorry, no feedback possible on this resource ...');
+ my $nofeed=&mt('Sorry, no feedback possible on this resource ...');
my %onload;
- if ($env{'environment.remote'} ne 'off') {
- $onload{'onload'} =
- "if (window.name!='loncapaclient') { self.window.close(); }";
- }
my %body_options = ('only_body' => 1,
'bgcolor' => '#FFFFFF',
'add_entries' => \%onload,);
if ($feedurl !~ m{^/adm/feedback}) {
- $body_options{'rediect'} = [2,$feedurl];
+ $body_options{'redirect'} = [2,$feedurl];
}
my $start_page=
&Apache::loncommon::start_page('Feedback not sent',undef,
@@ -2528,7 +2852,7 @@ sub no_redirect_back {
my $end_page = &Apache::loncommon::end_page();
- $feedurl=&Apache::lonenc::check_encrypt($feedurl);
+ &Apache::lonenc::check_encrypt(\$feedurl);
my $logo=&Apache::loncommon::lonhttpdurl('/adm/lonIcons/lonlogos.gif');
$r->print (<<ENDNOREDIRTWO);
$start_page
@@ -2540,57 +2864,86 @@ ENDNOREDIRTWO
}
sub screen_header {
- my ($feedurl,$symb) = @_;
+ my ($feedurl,$symb,$group) = @_;
+ my $crscontent = &mt('Question/Comment/Feedback about course content');
+ my $crspolicy = &mt('Question/Comment/Feedback about course policy');
+ my $contribdisc = &mt('Contribution to course discussion of resource');
+ my $anoncontrib = &mt('Anonymous contribution to course discussion of resource');
+ my $namevis = &mt('name only visible to course faculty');
+ my $crstype;
+ if ($env{'request.course.id'}) {
+ $crstype = &Apache::loncommon::course_type();
+ if ($crstype eq 'Community') {
+ $crscontent = &mt('Question/Comment/Feedback about community content');
+ $crspolicy = &mt('Question/Comment/Feedback about community policy');
+ $contribdisc = &mt('Contribution to community discussion of resource');
+ $anoncontrib = &mt('Anonymous contribution to community discussion of resource');
+ $namevis = &mt('name only visible to community facilitators');
+ }
+ }
my $msgoptions='';
my $discussoptions='';
unless (($env{'form.replydisc'}) || ($env{'form.editdisc'})) {
if (($feedurl=~/^\/res\//) && ($feedurl!~/^\/res\/adm/) && ($env{'user.adv'})) {
$msgoptions=
- '<p><label><input type="radio" name="discuss" value="author" /> '.
- &mt('Feedback to resource author').'</label></p>';
+ '<label><input type="radio" name="discuss" value="author" /> '.
+ &mt('Feedback to resource author').'</label><br />';
+ }
+ my %optionhash=();
+ foreach my $type ('question','comment','policy') {
+ $optionhash{$type}=$env{'course.'.$env{'request.course.id'}.'.'.$type.'.email.text'};
}
if (&feedback_available(1)) {
$msgoptions.=
- '<p><label><input type="radio" name="discuss" value="question" /> '.
- &mt('Question about resource content').'</label></p>';
+ '<label><input type="radio" name="discuss" value="question" /> '.
+ ($optionhash{'question'}?$optionhash{'question'}:&mt('Question about resource content')).'</label><br />';
}
if (&feedback_available(0,1)) {
$msgoptions.=
- '<p><label><input type="radio" name="discuss" value="course" /> '.
- &mt('Question/Comment/Feedback about course content').
- '</label></p>';
+ '<label><input type="radio" name="discuss" value="course" /> '.
+ ($optionhash{'comment'}?$optionhash{'comment'}:$crscontent).
+ '</label><br />';
}
if (&feedback_available(0,0,1)) {
$msgoptions.=
- '<p><label><input type="radio" name="discuss" value="policy" /> '.
- &mt('Question/Comment/Feedback about course policy').
- '</label></p>';
+ '<label><input type="radio" name="discuss" value="policy" /> '.
+ ($optionhash{'policy'}?$optionhash{'policy'}:$crspolicy).
+ '</label><br />';
}
}
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'}:''))) {
- 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();
+ 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')))) {
+ $discussoptions='<label><input type="radio" name="discuss" value="nonanon" checked="checked" /> '.
+ $contribdisc.
+ '</label><br /><label><input type="radio" name="discuss" value="anon" /> '.
+ $anoncontrib.
+ ' <i>('.$namevis.')</i></label> '.
+ '<a href="/adm/preferences?action=changescreenname">'.&mt('Change Screenname').'</a>';
+ my $blockblog = &Apache::loncommon::blocking_status('blogs');
+ if (!$blockblog) {
+ $discussoptions.= &add_blog_checkbox($crstype);
+ }
}
}
- if ($msgoptions) { $msgoptions='<h2><img src="'.&Apache::loncommon::lonhttpdurl('/adm/lonMisc/feedback.gif').'" />'.&mt('Sending Messages').'</h2>'.$msgoptions; }
+ if ($msgoptions) {
+ $msgoptions='<tr><th><img src="'.&Apache::loncommon::lonhttpdurl('/res/adm/pages/feedback.png').'" />'
+ .'<br />'.&mt('Send Feedback').'<br />'.&Apache::lonhtmlcommon::coursepreflink(&mt('Feedback Settings'),'feedback').'</th>'.
+ '<td>'.$msgoptions.'</td></tr>';
+ }
if ($discussoptions) {
- $discussoptions='<h2><img src="'.&Apache::loncommon::lonhttpdurl('/adm/lonMisc/chat.gif').'" />'.&mt('Discussion Contributions').'</h2>'.$discussoptions; }
- return $msgoptions.$discussoptions;
+ $discussoptions='<tr><th><img src="'.&Apache::loncommon::lonhttpdurl('/adm/lonMisc/chat.gif').'" alt="" />'
+ .'<br />'.&mt('Discussion Contributions').'<br />'.&Apache::lonhtmlcommon::coursepreflink(&mt('Discussion Settings'),'discussion').'</th>'.
+ '<td>'.$discussoptions.'</td></tr>';
+ }
+ return &Apache::loncommon::start_data_table().$msgoptions.$discussoptions.&Apache::loncommon::end_data_table();
}
sub resource_output {
@@ -2607,9 +2960,7 @@ sub resource_output {
}
sub clear_out_html {
- my ($message,$override,$ignore_htmlarea)=@_;
- if (!$ignore_htmlarea
- && !&Apache::lonhtmlcommon::htmlareablocked()) { return $message; }
+ my ($message,$override)=@_;
# Always allow the <m>-tag
my %html=(M=>1);
# Check if more is allowed
@@ -2618,11 +2969,12 @@ sub clear_out_html {
($override)) {
# allows <B> <I> <P> <A> <LI> <OL> <UL> <EM> <BR> <TT> <STRONG>
# <BLOCKQUOTE> <DIV .*> <DIV> <IMG> <M> <SPAN> <H1> <H2> <H3> <H4> <SUB>
- # <SUP>
+ # <SUP> <TABLE> <TR> <TD> <TH> <TBODY>
%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+)[^\>\<]*)/
@@ -2633,12 +2985,15 @@ sub clear_out_html {
}
sub assemble_email {
- my ($feedurl,$message,$prevattempts,$usersaw,$useranswer)=@_;
+ my ($message,$prevattempts,$usersaw,$useranswer)=@_;
my %lt = &Apache::lonlocal::texthash(
'prev' => 'Previous attempts of student (if applicable)',
'orig' => 'Original screen output (if applicable)',
'corr' => 'Correct Answer(s) (if applicable)',
);
+ if (&Apache::loncommon::course_type() eq 'Community') {
+ $lt{'prev'} = &mt('Previous attempts of member (if applicable)');
+ }
my $email=<<"ENDEMAIL";
$message
ENDEMAIL
@@ -2654,150 +3009,126 @@ 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 my $sec (split(/\;/,$sections)) {
- if (($sec eq $env{'request.course.sec'}) ||
- ($defaultflag && ($sec eq '*'))) {
- return $adr;
- }
- }
- } else {
- return $rec;
- }
- return '';
-}
-
-=pod
-
-=over 4
-
-=item *
-
-decide_receiver($feedurl,$author,$question,$course,$policy,$defaultflag);
-
-Arguments
- $feedurl - /res/ url of resource (only need if $author is true)
- $author,$question,$course,$policy - all true/false parameters
- if true will attempt to find the addresses of user that should receive
- this type of feedback (author - feedback to author of resource $feedurl,
- $question 'Resource Content Questions', $course 'Course Content Question',
- $policy 'Course Policy')
- (Additionally it also checks $env for whether the corresponding form.<name>
- element exists, for ease of use in a html response context)
-
- $defaultflag - (internal should be left blank) if true gather addresses
- that aren't for a section even if I have a section
- (used for reccursion internally, first we look for
- addresses for our specific section then we recurse
- and look for non section addresses)
-
-Returns
- $typestyle - string of html text, describing what addresses were found
- %to - a hash, which keys are addresses of users to send messages to
- the keys will look like name:domain
-
-=cut
-
-sub decide_receiver {
- my ($feedurl,$author,$question,$course,$policy,$defaultflag) = @_;
- my $typestyle='';
- my %to=();
- if ($env{'form.discuss'} eq 'author' ||$author) {
- $typestyle.='Submitting as Author Feedback<br />';
- $feedurl=~ m{^/res/($LONCAPA::domain_re)/($LONCAPA::username_re)/};
- $to{$2.':'.$1}=1;
- }
- if ($env{'form.discuss'} eq 'question' ||$question) {
- $typestyle.=&mt('Submitting as Question').'<br />';
- foreach my $item (split(/\,/,
- $env{'course.'.$env{'request.course.id'}.'.question.email'})
- ) {
- my $rec=&secapply($item,$defaultflag);
- if ($rec) { $to{$rec}=1; }
- }
- }
- if ($env{'form.discuss'} eq 'course' ||$course) {
- $typestyle.=&mt('Submitting as Comment').'<br />';
- foreach my $item (split(/\,/,
- $env{'course.'.$env{'request.course.id'}.'.comment.email'})
- ) {
- 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 my $item (split(/\,/,
- $env{'course.'.$env{'request.course.id'}.'.policy.email'})
- ) {
- my $rec=&secapply($item,$defaultflag);
- if ($rec) { $to{$rec}=1; }
- }
- }
- if ((scalar(%to) eq '0') && (!$defaultflag)) {
- ($typestyle,%to)=
- &decide_receiver($feedurl,$author,$question,$course,$policy,1);
- }
- return ($typestyle,%to);
-}
sub feedback_available {
my ($question,$course,$policy)=@_;
- my ($typestyle,%to)=&decide_receiver('',0,$question,$course,$policy);
+ my ($typestyle,%to)=&Apache::lonmsg::decide_receiver('',0,$question,
+ $course,$policy);
return scalar(%to);
}
sub send_msg {
- my ($title,$feedurl,$email,$citations,$attachmenturl,%to)=@_;
- my $status='';
- my $sendsomething=0;
- if ($title=~/^Error/) { $title=&mt('Feedback').': '.$title; }
- unless ($title=~/\w/) { $title=&mt('Feedback'); }
- foreach my $key (keys(%to)) {
- if ($key) {
- my $declutter=&Apache::lonnet::declutter($feedurl);
- unless (&Apache::lonmsg::user_normal_msg(split(/\:/,$key),
- $title.' ['.$declutter.']',$email,$citations,$feedurl,
- $attachmenturl)=~/ok/) {
- $status.='<br />'.&mt('Error sending message to').' '.$key.'<br />';
- } else {
- $sendsomething++;
- }
+ my ($title,$feedurl,$email,$citations,$attachmenturl,$symb,%to)=@_;
+ my $status='';
+ my $sendsomething=0;
+ my $restitle = &get_resource_title($symb,$feedurl);
+ if ($title=~/^Error/) { $title=&mt('Feedback').': '.$title; }
+ unless ($title=~/\w/) { $title=&mt('Feedback'); }
+ foreach my $key (keys(%to)) {
+ if ($key) {
+ my ($user,$domain) = split(/\:/,$key,2);
+ if (!defined($user)) {
+ $status.='<br />'.&mt('Error sending message to [_1], no user specified.',$key);
+ } elsif (!defined($domain)) {
+ $status.='<br />'.&mt('Error sending message to [_1], no domain specified.',$key);
+ } else {
+ unless (&Apache::lonmsg::user_normal_msg($user,$domain,
+ $title.' ['.$restitle.']',$email,$citations,$feedurl,
+ $attachmenturl,undef,undef,$symb,$restitle)=~/ok/) {
+ $status.='<br />'.&mt('Error sending message to').' '.$key.'<br />';
+ } else {
+ $sendsomething++;
+ }
+ }
+ }
}
- }
- my %record=&Apache::lonnet::restore('_feedback');
- my ($temp)=keys(%record);
- unless ($temp=~/^error\:/) {
- my %newrecord=();
- $newrecord{'resource'}=$feedurl;
- $newrecord{'subnumber'}=$record{'subnumber'}+1;
- unless (&Apache::lonnet::cstore(\%newrecord,'_feedback') eq 'ok') {
- $status.='<br />'.&mt('Not registered').'<br />';
- }
+# Records of number of feedback messages are kept under the "symb" called "_feedback"
+# There are two entries within the framework of a course:
+# - the URLs for which feedback was provided
+# - the total number of contributions
+ if ($sendsomething) {
+ my %record=&getfeedbackrecords();
+ my ($temp)=keys(%record);
+ unless ($temp=~/^error\:/) {
+ my %newrecord=();
+ $newrecord{'resource'}=$feedurl;
+ $newrecord{'subnumber'}=$record{'subnumber'}+1;
+ unless (&Apache::lonnet::cstore(\%newrecord,'_feedback') eq 'ok') {
+ $status.='<br />'.&mt('Not registered').'<br />';
+ }
+ }
}
-
- return ($status,$sendsomething);
+ return ($status,$sendsomething);
+}
+
+# Routine to get the complete feedback records
+
+sub getfeedbackrecords {
+ my ($uname,$udom,$course)=@_;
+ unless ($uname) { $uname=$env{'user.name'}; }
+ unless ($udom) { $udom=$env{'user.domain'}; }
+ unless ($course) { $course=$env{'request.course.id'}; }
+ my %record=&Apache::lonnet::restore('_feedback',$course,$udom,$uname);
+ return %record;
+}
+
+# Routine to get feedback statistics
+
+sub getfeedbackstats {
+ my %record=&getfeedbackrecords(@_);
+ return ($record{'subnumber'},$record{'points'},$record{'totallikes'});
+}
+
+# Store feedback credit
+
+sub storefeedbackpoints {
+ my ($points,$uname,$udom,$course)=@_;
+ unless ($points) { $points=0; }
+ unless ($uname) { $uname=$env{'user.name'}; }
+ unless ($udom) { $udom=$env{'user.domain'}; }
+ unless ($course) { $course=$env{'request.course.id'}; }
+ my %record=('grader_user' => $env{'user.name'},
+ 'grader_domain' => $env{'user.domain'},
+ 'points' => $points);
+ return &Apache::lonnet::cstore(\%record,'_feedback',$course,$udom,$uname);
+}
+
+# Store feedback "likes"
+
+sub storefeedbacklikes {
+ my ($likes,$uname,$udom,$course)=@_;
+ unless ($likes) { $likes=0; }
+ if ($likes>0) { $likes=1; }
+ if ($likes<0) { $likes=-1; }
+ unless ($uname) { $uname=$env{'user.name'}; }
+ unless ($udom) { $udom=$env{'user.domain'}; }
+ unless ($course) { $course=$env{'request.course.id'}; }
+ my %record=&getfeedbackrecords($uname,$udom,$course);
+ my $totallikes=$record{'totallikes'};
+ $totallikes+=$likes;
+ my %newrecord=('likes_user' => $env{'user.name'},
+ 'likes_domain' => $env{'user.domain'},
+ 'likes' => $likes,
+ 'totallikes' => $totallikes);
+ return &Apache::lonnet::cstore(\%newrecord,'_feedback',$course,$udom,$uname);
}
+
sub adddiscuss {
- my ($symb,$email,$anon,$attachmenturl,$subject)=@_;
+ my ($symb,$email,$anon,$attachmenturl,$subject,$group)=@_;
my $status='';
- my $realsymb;
- if ($symb=~/^bulletin___/) {
- my $filename=(&Apache::lonnet::decode_symb($symb))[2];
- $filename=~s|^adm/wrapper/||;
- $realsymb=&Apache::lonnet::symbread($filename);
+ my $realsymb = &get_realsymb($symb);
+ my ($cnum,$cdom);
+ if ($env{'request.course.id'}) {
+ $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+ $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
}
if (&discussion_open(undef,$realsymb) &&
- &Apache::lonnet::allowed('pch',$env{'request.course.id'}.
- ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''))) {
+ (&Apache::lonnet::allowed('pch',$env{'request.course.id'}.
+ ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:'')) ||
+ (($group ne '') && (&check_group_priv($group,'pgd') eq 'ok') &&
+ ($symb =~ m{^bulletin___\d+___adm/wrapper/adm/\Q$cdom\E/\Q$cnum\E/\d+/bulletinboard$})))) {
my %contrib=('message' => $email,
'sendername' => $env{'user.name'},
@@ -2877,7 +3208,7 @@ sub adddiscuss {
$env{'course.'.$env{'request.course.id'}.'.domain'},
$env{'course.'.$env{'request.course.id'}.'.num'});
}
- my %record=&Apache::lonnet::restore('_discussion');
+ my %record=&getdiscussionrecords();
my ($temp)=keys(%record);
unless ($temp=~/^error\:/) {
my %newrecord=();
@@ -2885,6 +3216,7 @@ sub adddiscuss {
$newrecord{'subnumber'}=$record{'subnumber'}+1;
$status.='<br />'.&mt('Registering').': '.
&Apache::lonnet::cstore(\%newrecord,'_discussion');
+ &updatekarma();
}
} else {
$status.='Failed.';
@@ -2892,6 +3224,108 @@ sub adddiscuss {
return $status.'<br />';
}
+
+# Routine to get the complete discussion records
+
+sub getdiscussionrecords {
+ my ($uname,$udom,$course)=@_;
+ unless ($uname) { $uname=$env{'user.name'}; }
+ unless ($udom) { $udom=$env{'user.domain'}; }
+ unless ($course) { $course=$env{'request.course.id'}; }
+ my %record=&Apache::lonnet::restore('_discussion',$course,$udom,$uname);
+ return %record;
+}
+
+# Routine to get discussion statistics
+
+sub getdiscussionstats {
+ my %record=&getdiscussionrecords(@_);
+ my $totalvotes = $record{'totallikes'} + $record{'totalunlikes'};
+ return ($record{'subnumber'},$record{'points'},$record{'totallikes'},$totalvotes);
+}
+
+# Calculate discussion karma
+
+sub calcdiscussionkarma {
+ my ($subs,$pts,$likes,$votes)=&getdiscussionstats(@_);
+ my $karma=0;
+ if ($votes>0) {
+ $karma=int(.1+5.*(1.-exp(-$subs/10.))*$likes/$votes);
+ if ($karma<0) { $karma=0; }
+ if ($karma>5) { $karma=5; }
+ }
+ return $karma;
+}
+
+# Update karma
+
+sub updatekarma {
+ my ($uname,$udom,$course)=@_;
+ unless ($uname) { $uname=$env{'user.name'}; }
+ unless ($udom) { $udom=$env{'user.domain'}; }
+ unless ($course) { $course=$env{'request.course.id'}; }
+ my $karma=&calcdiscussionkarma($uname,$udom,$course);
+ &Apache::lonnet::cstore({ 'karma' => $karma },'_discussion',$course,$udom,$uname);
+ &Apache::lonnet::do_cache_new('karma',$uname.':'.$udom.':'.$course,$karma,3600);
+ return $karma;
+}
+
+# Retrieve karma
+
+sub userkarma {
+ my ($uname,$udom,$course)=@_;
+ unless ($uname) { $uname=$env{'user.name'}; }
+ unless ($udom) { $udom=$env{'user.domain'}; }
+ unless ($course) { $course=$env{'request.course.id'}; }
+ my $hashkey=$uname.':'.$udom.':'.$course;
+ my ($karma,$cached)=&Apache::lonnet::is_cached_new('karma',$hashkey);
+ if ($cached) {
+ return $karma;
+ }
+ my %userdisc=&getdiscussionrecords($uname,$udom,$course);
+ $karma=$userdisc{'karma'};
+ &Apache::lonnet::do_cache_new('karma',$hashkey,$karma,3600);
+ return $karma;
+}
+
+# Store discussion credit
+
+sub storediscussionpoints {
+ my ($points,$uname,$udom,$course)=@_;
+ unless ($points) { $points=0; }
+ unless ($uname) { $uname=$env{'user.name'}; }
+ unless ($udom) { $udom=$env{'user.domain'}; }
+ unless ($course) { $course=$env{'request.course.id'}; }
+ my %record=('grader_user' => $env{'user.name'},
+ 'grader_domain' => $env{'user.domain'},
+ 'points' => $points);
+ return &Apache::lonnet::cstore(\%record,'_discussion',$course,$udom,$uname);
+}
+
+# Store discussion "likes"
+
+sub storediscussionlikes {
+ my ($chglikes,$chgunlikes,$uname,$udom,$course,$context)=@_;
+ unless ($uname) { $uname=$env{'user.name'}; }
+ unless ($udom) { $udom=$env{'user.domain'}; }
+ unless ($course) { $course=$env{'request.course.id'}; }
+ my %record=&getdiscussionrecords($uname,$udom,$course);
+ my $totallikes=$record{'totallikes'};
+ my $totalunlikes=$record{'totalunlikes'};
+ $totallikes += $chglikes;
+ $totalunlikes += $chgunlikes;
+ my %newrecord=('likes_user' => $env{'user.name'},
+ 'likes_domain' => $env{'user.domain'},
+ 'totallikes' => $totallikes,
+ 'totalunlikes' => $totalunlikes,
+ 'context' => $context);
+ my $status=&Apache::lonnet::cstore(\%newrecord,'_discussion',$course,$udom,$uname);
+ if ($status eq 'ok') {
+ &updatekarma($uname,$udom,$course);
+ }
+ return $status;
+}
+
sub get_discussion_info {
my ($idx,%contrib) = @_;
my $changelast = 0;
@@ -2948,17 +3382,51 @@ sub show_preview {
&newline_to_br(\$message);
$message=&Apache::lonspeller::markeduptext($message);
$message=&Apache::lontexconvert::msgtexconverted($message);
- my $subject=&clear_out_html($env{'form.subject'},undef,1);
+ my $subject=&clear_out_html($env{'form.subject'});
$subject=~s/\n/\<br \/\>/g;
$subject=&Apache::lontexconvert::msgtexconverted($subject);
my $end_page = &Apache::loncommon::end_page();
- $r->print($start_page.'<table border="2"><tr><td>'.
- '<b>'.&mt('Subject').':</b> '.$subject.'<br /><br />'.
- $message.'</td></tr></table>'.$end_page);
+ $r->print($start_page
+ .'<h1>'.&mt('Preview').'</h1>'
+ .&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*/>|
+ >.*</\1\s*>
+ )}xs
+ );
+}
+
+sub tidy_html {
+ my ($message)=@_;
+# my $tidy = HTML::Tidy::libXML->new();
+# my $xhtml = $tidy->clean($message, 'utf-8', 1);
+# $xhtml =~ m/<body>(.*)<\/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)=@_;
@@ -2989,24 +3457,25 @@ sub generate_preview_button {
return(<<ENDPREVIEW);
<br />
<form name="preview" action="/adm/feedback?preview=1" method="post" target="preview">
-<input type="hidden" name="subject">
+<input type="hidden" name="subject" />
<input type="hidden" name="comment" />
<input type="button" value="$pre"
-onClick="if (typeof(document.$formname.onsubmit)=='function') {document.$formname.onsubmit();};this.form.comment.value=document.$formname.$fieldname.value;this.form.subject.value=document.$formname.subject.value;this.form.submit();" />
+onclick="if (typeof(document.$formname.onsubmit)=='function') {document.$formname.onsubmit();};this.form.comment.value=document.$formname.$fieldname.value;this.form.subject.value=document.$formname.subject.value;this.form.submit();" />
</form>
ENDPREVIEW
}
sub modify_attachments {
- my ($r,$currnewattach,$currdelold,$symb,$idx,$attachmenturls)=@_;
+ my ($r,$currnewattach,$currdelold,$symb,$idx,$attachmenturls,
+ $attachmaxtext,$toolarge)=@_;
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',
+ 'adda' => 'Add a new attachment to this post',
+ 'stch' => 'Save Changes',
+ 'clic' => 'Add/remove attachments',
);
my $js = <<END;
<script type="text/javascript">
@@ -3017,11 +3486,17 @@ sub modify_attachments {
</script>
END
+ # Breadcrumbs
+ my $brcrum = [{'href' => '',
+ 'text' => 'Discussion Post Attachments'}];
+ my %parms=('only_body' => 1);
+ if ($env{'form.modal'} ne 'yes') { 'bread_crumbs' => $brcrum }
+
my $start_page =
- &Apache::loncommon::start_page('Discussion Post Attachments',$js);
+ &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/\<br \/\>/g;
$subject=&Apache::lontexconvert::msgtexconverted($subject);
my $timestamp=$env{'form.timestamp'};
@@ -3040,39 +3515,45 @@ END
$r->print(<<END);
$start_page
+$toolarge
<form name="modattachments" method="post" enctype="multipart/form-data" action="/adm/feedback?attach=$symb">
- <table border="2">
- <tr>
- <td>
- <b>Subject:</b> $subject</b><br /><br />
+
+ <h1>$lt{'clic'}</h1>
END
- if ($idx) {
- if ($attachmenturls) {
- my @currold = keys(%currattach);
- if (@currold > 0) {
- $r->print($lt{'thfo'}.'<br />'.$lt{'chth'}.'<br />'."\n");
- foreach my $id (@currold) {
- my $attachurl = &HTML::Entities::decode($attachments{$id}{'filename'});
- $attachurl =~ m#/([^/]+)$#;
- $r->print('<label><input type="checkbox" name="deloldattach" value="'.$id.'" /> '.$1.'</label><br />'."\n");
+ $r->print(&Apache::lonhtmlcommon::start_pick_box());
+ $r->print(&Apache::lonhtmlcommon::row_title(&mt('Subject')));
+ $r->print('<b>'.$subject.'</b>');
+ $r->print(&Apache::lonhtmlcommon::row_closure());
+ $r->print(&Apache::lonhtmlcommon::row_title($lt{'adda'}));
+ $r->print('<input type="file" name="addnewattach" /><input type="button" name="upload" value="Upload" onclick="this.form.submit()" /> '.$attachmaxtext);
+ if(($idx)||(ref($currnewattach) eq 'ARRAY') && (@{$currnewattach} > 0)){
+ $r->print(&Apache::lonhtmlcommon::row_closure());
+ $r->print(&Apache::lonhtmlcommon::row_title(&mt('Attachments')));
+ if ($idx) {
+ if ($attachmenturls) {
+ my @currold = keys(%currattach);
+ if (@currold > 0) {
+ $r->print($lt{'thfo'}.'<br />'.$lt{'chth'}.'<br />'."\n");
+ foreach my $id (@currold) {
+ my $attachurl = &HTML::Entities::decode($attachments{$id}{'filename'});
+ $attachurl =~ m#/([^/]+)$#;
+ $r->print('<label><input type="checkbox" name="deloldattach" value="'.$id.'" /> '.$1.'</label><br />'."\n");
+ }
+ $r->print("<br />");
}
- $r->print("<br />");
}
}
- }
- if ((ref($currnewattach) eq 'ARRAY') && (@{$currnewattach} > 0)) {
- $r->print($lt{'thef'}.'<br />'.$lt{'chth'}.'<br />'."\n");
- foreach my $attach (@{$currnewattach}) {
- $attach =~ m#/([^/]+)$#;
- $r->print('<label><input type="checkbox" name="delnewattach" value="'.$attach.'" /> '.$1.'</label><br />'."\n");
+ if ((ref($currnewattach) eq 'ARRAY') && (@{$currnewattach} > 0)) {
+ $r->print($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(&Apache::lonhtmlcommon::row_closure(1));
+ $r->print(&Apache::lonhtmlcommon::end_pick_box());
$r->print(<<END);
- $lt{'adda'} <input type="file" name="addnewattach" /><input type="button" name="upload" value="Upload" onClick="this.form.submit()" />
- </td>
- </tr>
- </table>
<input type="hidden" name="subject" value="$env{'form.subject'}" />
<input type="hidden" name="comment" value="$env{'form.comment'}" />
<input type="hidden" name="timestamp" value="$env{'form.timestamp'}" />
@@ -3089,7 +3570,7 @@ END
$r->print('<input type="hidden" name="deloldattach" value="'.$item.'" />'."\n");
}
$r->print(<<END);
- <input type="button" name="rtntoedit" value="$lt{'stch'}" onClick="setAction()"/>
+ <input type="button" name="rtntoedit" value="$lt{'stch'}" onclick="setAction()" />
</form>
$end_page
END
@@ -3130,13 +3611,13 @@ sub generate_attachments_button {
my $origpage = $ENV{'REQUEST_URI'};
my $att=$attachnum.' '.&mt("attachments");
my %lt = &Apache::lonlocal::texthash(
- 'clic' => 'Click to add/remove attachments',
+ 'clic' => 'Add/remove attachments',
);
my $response = (<<END);
<br />
<form name="attachment" action="/adm/feedback?attach=$ressymb" method="post">
-$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);
+<input type="button" value="$lt{'clic'}"
+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();';
@@ -3151,8 +3632,8 @@ this.form.submit();" />
<input type="hidden" name="timestamp" value="$now" />
<input type="hidden" name="subject" />
<input type="hidden" name="comment" />
-<input type="hidden" name="blog" value = "0" />
-<input type="hidden" name="discuss" value = "0" />
+<input type="hidden" name="blog" value="0" />
+<input type="hidden" name="discuss" value="0" />
<input type="hidden" name="numoldver" value="$numoldver" />
ENDATTACH
if (defined($deloldattach)) {
@@ -3281,7 +3762,8 @@ sub construct_attachmenturl {
}
sub add_blog_checkbox {
- my ($checkstatus);
+ my ($crstype) = @_;
+ my $checkstatus;
if ($env{'form.blog'}) {
$checkstatus = 'checked="checked"';
}
@@ -3295,27 +3777,39 @@ function setblogvalue() {
}
}
</script><br />
-<label><input type="checkbox" name="blog" '.$checkstatus.' /> '.
-&mt('Add to my public course blog').'</label><br />'."\n";
+<label><input type="checkbox" name="blog" '.$checkstatus.' /> ';
+ if ($crstype eq 'Community') {
+ $output .= &mt('Add to my public community blog');
+ } else {
+ $output .= &mt('Add to my public course blog');
+ }
+ $output .= '</label><br />'."\n";
return $output;
}
sub has_discussion {
my $resourcesref = shift;
my $navmap = Apache::lonnavmaps::navmap->new();
- my @allres=$navmap->retrieveResources();
- foreach my $resource (@allres) {
- if ($resource->hasDiscussion()) {
- my $ressymb = $resource->wrap_symb();
- push(@{$resourcesref}, $ressymb);
+ if (defined($navmap)) {
+ my @allres=$navmap->retrieveResources();
+ foreach my $resource (@allres) {
+ if ($resource->hasDiscussion()) {
+ my $ressymb = $resource->wrap_symb();
+ if (ref($resourcesref) eq 'ARRAY') {
+ push(@{$resourcesref}, $ressymb);
+ }
+ }
}
+ } else {
+ &Apache::lonnet::logthis('Has discussion check failed - could not create navmap object.');
}
return;
}
sub sort_filter_names {
- my ($sort_types,$role_types,$status_types) = @_;
- %{$sort_types} = (
+ my ($sort_types,$role_types,$status_types,$crstype) = @_;
+ if (ref($sort_types) eq 'HASH') {
+ %{$sort_types} = (
ascdate => 'Date order - oldest first',
descdate => 'Date order - newest first',
thread => 'Threaded',
@@ -3323,22 +3817,28 @@ sub sort_filter_names {
username => 'By domain and username',
lastfirst => 'By last name, first name'
);
- %{$role_types} = (
- all => 'All roles',
- st => 'Students',
- cc => 'Course Coordinators',
- in => 'Instructors',
- ta => 'TAs',
- ep => 'Exam proctors',
- ad => 'Administrators',
- cr => 'Custom roles'
- );
- %{$status_types} = (
+ }
+ my @courseroles = qw(st in ta ep ad);
+ if ($crstype eq 'Community') {
+ push(@courseroles,'co');
+ } else {
+ push(@courseroles,'cc');
+ }
+ if (ref($role_types) eq 'HASH') {
+ foreach my $role (@courseroles) {
+ $role_types->{$role} = &Apache::lonnet::plaintext($role,$crstype);
+ }
+ $role_types->{'all'} = 'All roles';
+ $role_types->{'cr'} = 'Custom role';
+ }
+ if (ref($status_types) eq 'HASH') {
+ %{$status_types} = (
all => 'Roles of any status',
Active => 'Only active roles',
Expired => 'Only past roles',
Future => 'Only future roles',
);
+ }
}
sub handler {
@@ -3352,10 +3852,17 @@ sub handler {
# --------------------------- Get query string for limited number of parameters
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
- ['hide','unhide','deldisc','postdata','preview','replydisc','editdisc','cmd','symb','onlyunread','allposts','onlyunmark','previous','markread','markonread','markondisp','toggoff','toggon','modifydisp','changes','navtime','navmaps','navurl','sortposts','applysort','rolefilter','statusfilter','sectionpick','groupick','posterlist','userpick','attach','origpage','currnewattach','deloldattach','keepold','allversions','export','sendmessageonly','group','ref']);
+ ['like','unlike','modal','hide','unhide','deldisc','undeleteall','postdata','preview','replydisc','editdisc','cmd','symb','onlyunread','allposts','onlyunmark','previous','markread','markonread','markondisp','toggoff','toggon','modifydisp','changes','navtime','navmaps','navurl','sortposts','applysort','rolefilter','statusfilter','sectionpick','groupick','posterlist','userpick','attach','origpage','currnewattach','deloldattach','keepold','allversions','export','sendmessageonly','group','ref']);
my $group = $env{'form.group'};
+ my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+ my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+
+ my %attachmax = (
+ text => &mt('(128 KB max size)'),
+ num => 131072,
+ );
if ($env{'form.editdisc'}) {
- if (!(&editing_allowed($env{'form.editdisc'},$env{'form.group'}))) {
+ if (!(&editing_allowed($env{'form.editdisc'},$group))) {
my $symb=(split(/\:\:\:/,$env{'form.editdisc'}))[0];
my ($map,$id,$url)=&Apache::lonnet::decode_symb($symb);
my $feedurl=&Apache::lonnet::clutter($url);
@@ -3396,38 +3903,33 @@ sub handler {
&Apache::loncommon::no_cache($r);
$r->send_http_header;
- $r->print(&Apache::loncommon::start_page('Discussion Post Versions'));
+ # Breadcrumbs
+ my $brcrum = [{'href' => '',
+ 'text' => 'Discussion Post Versions'}];
+
+ my %parms=();
+ if ($env{'form.modal'} ne 'yes') { 'bread_crumbs' => $brcrum }
+
+ $r->print(&Apache::loncommon::start_page('Discussion Post Versions',undef,\%parms));
- my $crs='/'.$env{'request.course.id'};
- if ($env{'request.course.sec'}) {
- $crs.='_'.$env{'request.course.sec'};
- }
- $crs=~s|_|/|g;
- my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
- my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
my ($symb,$idx)=split(/\:\:\:/,$env{'form.allversions'});
- ($symb)=&get_feedurl_and_clean_symb($symb);
+ ($symb, my $feedurl)=&get_feedurl_and_clean_symb($symb);
my $ressymb = &wrap_symb($symb);
- my $group = $env{'form.group'};
my $seeid;
- if (($group ne '') && (($ressymb =~ m|^bulletin___\d+___adm/wrapper/adm/\Q$cdom\E/\Q$cnum\E/\d+/bulletinboard$|))) {
- if (&check_group_priv($group,'dgp') eq 'ok') {
- $seeid = 1;
- }
- } else {
- $seeid = &Apache::lonnet::allowed('rin',$crs);
+ if (&Apache::lonnet::allowed('rin',$env{'request.course.id'}.($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''))) {
+ $seeid = 1;
}
+ my $seehidden = &can_see_hidden('',$ressymb,$feedurl,$group,$cdom,$cnum);
if ($idx > 0) {
my %messages = ();
my %subjects = ();
my %attachmsgs = ();
my %allattachments = ();
my %imsfiles = ();
- my ($screenname,$plainname);
+ my ($screenname,$plainname,$showaboutme);
my %contrib=&Apache::lonnet::restore($symb,$env{'request.course.id'},
- $env{'course.'.$env{'request.course.id'}.'.domain'},
- $env{'course.'.$env{'request.course.id'}.'.num'});
- $r->print(&get_post_contents(\%contrib,$idx,$seeid,'allversions',\%messages,\%subjects,\%allattachments,\%attachmsgs,\%imsfiles,\$screenname,\$plainname));
+ $cdom,$cnum);
+ $r->print(&get_post_contents(\%contrib,$idx,$seeid,$seehidden,'allversions',\%messages,\%subjects,\%allattachments,\%attachmsgs,\%imsfiles,\$screenname,\$plainname,\$showaboutme));
}
$r->print(&Apache::loncommon::end_page());
return OK;
@@ -3479,9 +3981,7 @@ sub handler {
my $feedurl = '/adm/navmaps';
if ($env{'form.navurl'}) { $feedurl .= '?'.$env{'form.navurl'}; }
my %lt = &Apache::lonlocal::texthash(
- 'mnpa' => 'Marked "New" posts as read in a total of',
- 'robb' => 'resources/bulletin boards.',
- 'twnp' => 'There are currently no resources or bulletin boards with unread discussion postings.'
+ 'twnp' => 'There are currently no resources or discussion boards with unread discussion postings.'
);
foreach my $res (@resources) {
my $ressymb=$res;
@@ -3489,7 +3989,10 @@ sub handler {
my $lastkey = $ressymb.'_lastread';
$discinfo{$lastkey} = $env{'form.navtime'};
}
- my $textline = "<b>$lt{'mnpa'} $numitems $lt{'robb'}</b>";
+ my $textline = '<b>'.
+ &mt('Marked "New" posts as read in a total of [_1] resources/bulletin boards.',
+ $numitems).
+ '</b>';
if ($numitems > 0) {
&Apache::lonnet::put('nohist_'.$env{'request.course.id'}.'_discuss',
\%discinfo,$env{'user.domain'},$env{'user.name'});
@@ -3500,10 +4003,6 @@ sub handler {
$r->send_http_header;
my $logo=&Apache::loncommon::lonhttpdurl('/adm/lonIcons/lonlogos.gif');
my %onload;
- if ($env{'environment.remote'} ne 'off') {
- $onload{'onload'} =
- "if (window.name!='loncapaclient') { this.document.reldt.submit(); self.window.close(); }";
- }
my $start_page=
&Apache::loncommon::start_page('New posts marked as read',undef,
@@ -3569,37 +4068,32 @@ ENDREDIR
my $entry=$env{'form.hide'}?$env{'form.hide'}:$env{'form.unhide'};
my ($symb,$idx)=split(/\:\:\:/,$entry);
($symb,my $feedurl)=&get_feedurl_and_clean_symb($symb);
+ my $ressymb = &wrap_symb($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);
-
- if ($env{'form.hide'} && !$seeid && !(&editing_allowed($env{'form.hide'},$env{'form.group'}))) {
- &redirect_back($r,$feedurl,&mt('Deletion not permitted').'<br />', '0','0','','',$env{'form.previous'},'','','','',
- undef,undef,$group,);
+ my $seehidden = &can_see_hidden('',$ressymb,$feedurl,$group,$cdom,$cnum);
+ unless (($seehidden) || (&editing_allowed($env{'form.hide'},$group))) {
+ &redirect_back($r,$feedurl,&mt('Hiding not permitted').'<br />',
+ '0','0','','',$env{'form.previous'},'','','','',
+ undef,undef,$group,);
return OK;
}
my %contrib=&Apache::lonnet::restore($symb,$env{'request.course.id'},
- $env{'course.'.$env{'request.course.id'}.'.domain'},
- $env{'course.'.$env{'request.course.id'}.'.num'});
+ $cdom,$cnum);
my $currenthidden=$contrib{'hidden'};
my $currentstudenthidden=$contrib{'studenthidden'};
if ($env{'form.hide'}) {
$currenthidden.='.'.$idx.'.';
- unless ($seeid) {
+ unless ($seehidden) {
$currentstudenthidden.='.'.$idx.'.';
}
} else {
$currenthidden=~s/\.$idx\.//g;
}
my %newhash=('hidden' => $currenthidden);
- if ( ($env{'form.hide'}) && (!$seeid) ) {
+ if ( ($env{'form.hide'}) && (!$seehidden) ) {
$newhash{'studenthidden'} = $currentstudenthidden;
}
if ($env{'form.hide'}) {
@@ -3608,26 +4102,209 @@ ENDREDIR
($changelast,$newlast) = &get_discussion_info($idx,%contrib);
if ($changelast) {
&Apache::lonnet::put('discussiontimes',{$symb => $newlast},
- $env{'course.'.$env{'request.course.id'}.'.domain'},
- $env{'course.'.$env{'request.course.id'}.'.num'});
+ $cdom,$cnum);
}
}
- &Apache::lonnet::store(\%newhash,$symb,$env{'request.course.id'},
- $env{'course.'.$env{'request.course.id'}.'.domain'},
- $env{'course.'.$env{'request.course.id'}.'.num'});
-
- &redirect_back($r,$feedurl,&mt('Changed discussion status').'<br />',
- '0','0','','',$env{'form.previous'},undef,undef,undef,
+ my $result;
+ if (&Apache::lonnet::store(\%newhash,$symb,$env{'request.course.id'},
+ $cdom,$cnum) eq 'ok') {
+ my $prefix=$symb.':'.$idx.':';
+ my %likes=&Apache::lonnet::dump('disclikes',$cdom,$cnum,
+ '^'.$prefix);
+ my ($totallikes,$totalunlikes);
+ if (ref($likes{$prefix.'likers'}) eq 'HASH') {
+ $totallikes = scalar(keys(%{$likes{$prefix.'likers'}}));
+ }
+ if (ref($likes{$prefix.'unlikers'}) eq 'HASH') {
+ $totalunlikes = scalar(keys(%{$likes{$prefix.'unlikers'}}));
+ }
+ if ($totallikes || $totalunlikes) {
+ my ($chglikes,$chgunlikes,$context);
+ if ($env{'form.hide'}) {
+ $chglikes = -1 * $totallikes;
+ $chgunlikes = -1 * $totalunlikes;
+ $context = 'hide';
+ } else {
+ $chglikes = $totallikes;
+ $chgunlikes = $totalunlikes;
+ $context = 'unhide';
+ }
+ &storediscussionlikes($chglikes,$chgunlikes,
+ $contrib{$idx.':sendername'},
+ $contrib{$idx.':senderdomain'},
+ $env{'request.course.id'},
+ $context);
+
+ }
+ $result = &mt('Changed discussion status');
+ } else {
+ $result = &mt('Discussion status unchanged');
+ }
+ &redirect_back($r,$feedurl,$result.'<br />','0','0','','',
+ $env{'form.previous'},undef,undef,undef,
+ undef,undef,undef,$group);
+ return OK;
+ } elsif (($env{'form.like'}) || ($env{'form.unlike'})) {
+# ----------------------------------------------------------------- Like/unlike
+ my $entry=$env{'form.like'}?$env{'form.like'}:$env{'form.unlike'};
+ my ($symb,$idx)=split(/\:\:\:/,$entry);
+ ($symb,my $feedurl)=&get_feedurl_and_clean_symb($symb);
+ my $result;
+ if ($idx > 0) {
+ my $realsymb = &get_realsymb($symb);
+ my $status='OPEN';
+ if ($Apache::lonhomework::parsing_a_problem ||
+ $Apache::lonhomework::parsing_a_task) {
+ $status=$Apache::inputtags::status[-1];
+ }
+ if (&discussion_vote_available($status,$realsymb)) {
+ my %contrib=&Apache::lonnet::restore($symb,$env{'request.course.id'},
+ $cdom,$cnum);
+ my $ownpost;
+ if (($contrib{$idx.':sendername'} eq $env{'user.name'}) &&
+ ($contrib{$idx.':senderdomain'} eq $env{'user.domain'})) {
+ $ownpost = 1;
+ }
+ if ($ownpost || $contrib{$idx.':hidden'} || $contrib{$idx.':deleted'}) {
+ $result = &mt('Vote not registered.').' ';
+ }
+ if ($ownpost) {
+ $result .= &mt('No voting for your own posts.');
+ } elsif ($contrib{$idx.':hidden'}) {
+ $result .= &mt('No voting for hidden posts.');
+ } elsif ($contrib{$idx.':deleted'}) {
+ $result .= &mt('No voting for deleted posts.');
+ } else {
+#
+# Likes and unlikes are in db-file "disclikes" of the course
+# The prefix is the $symb to identify the resource discussion,
+# and the $idx to identify the entry
+#
+ my $prefix=$symb.':'.$idx.':';
+ my %likes=&Apache::lonnet::dump('disclikes',$cdom,$cnum,
+ '^'.$prefix);
+
+# Get current like or unlike status for the $idx for this user.
+ my $thisuser=$env{'user.name'}.':'.$env{'user.domain'};
+ my ($userlikes,$userunlikes);
+ if (ref($likes{$prefix.'likers'}) eq 'HASH') {
+ if (exists($likes{$prefix.'likers'}{$thisuser})) {
+ $userlikes = 1;
+ }
+ }
+ if (ref($likes{$prefix.'unlikers'}) eq 'HASH') {
+ if (exists($likes{$prefix.'unlikers'}{$thisuser})) {
+ $userunlikes = 1;
+ }
+ }
+# Get the current "likes" count
+ my $likescount=$likes{$prefix.'likes'};
+# Find out if they already voted
+# Users cannot like a post twice, or unlike it twice.
+# They can change their mind, though.
+ my $alreadyflag=0;
+ my $votetype;
+ if ($env{'form.like'}) {
+ if ($userlikes) {
+ $alreadyflag=1;
+ } elsif ($userunlikes) {
+ delete($likes{$prefix.'unlikers'}{$thisuser});
+ $votetype = 'switch';
+ $likescount++;
+ } else {
+ if (ref($likes{$prefix.'likers'}) eq 'HASH') {
+ $likes{$prefix.'likers'}{$thisuser} = 1;
+ } else {
+ $likes{$prefix.'likers'} = {$thisuser => 1};
+ }
+ $likescount++;
+ }
+ } else {
+ if ($userunlikes) {
+ $alreadyflag=1;
+ } elsif ($userlikes) {
+ delete($likes{$prefix.'likers'}{$thisuser});
+ $votetype = 'switch';
+ $likescount--;
+ } else {
+ if (ref($likes{$prefix.'unlikers'}) eq 'HASH') {
+ $likes{$prefix.'unlikers'}{$thisuser} = 1;
+ } else {
+ $likes{$prefix.'unlikers'} = {$thisuser => 1};
+ }
+ $likescount--;
+ }
+ }
+# $alreadyflag would be 1 if they tried to double-like or double-unlike
+ if ($alreadyflag) {
+ if ($env{'form.like'}) {
+ $result= &mt("'Like' already registered");
+ } else {
+ $result= &mt("'Unlike' already registered");
+ }
+ } else {
+ my %newhash=($prefix.'likes' => $likescount,
+ $prefix.'likers' => $likes{$prefix.'likers'},
+ $prefix.'unlikers' => $likes{$prefix.'unlikers'});
+# Store data in db-file "disclikes"
+ if (&Apache::lonnet::put('disclikes',\%newhash,$cdom,$cnum) eq 'ok') {
+# Also store with the person who posted the liked/unliked entry
+ my ($chglike,$chgunlike);
+ if ($env{'form.like'}) {
+ if ($votetype eq 'switch') {
+ $chglike = 0;
+ $chgunlike = -1;
+ } else {
+ $chglike = 1;
+ $chgunlike = 0;
+ }
+ &storediscussionlikes($chglike,$chgunlike,
+ $contrib{$idx.':sendername'},
+ $contrib{$idx.':senderdomain'},
+ $env{'request.course.id'},'like');
+ $result=&mt("Registered 'Like'");
+ } else {
+ if ($votetype eq 'switch') {
+ $chglike = -1;
+ $chgunlike = 0;
+ } else {
+ $chglike = 0;
+ $chgunlike = 1;
+ }
+ &storediscussionlikes($chglike,$chgunlike,
+ $contrib{$idx.':sendername'},
+ $contrib{$idx.':senderdomain'},
+ $env{'request.course.id'},'unlike');
+ $result=&mt("Registered 'Unlike'");
+ }
+ } else {
+# Oops, something went wrong
+ $result=&mt("Failed to register vote");
+ }
+ }
+ }
+ } else {
+ $result=&mt('Voting unavailable for this discussion');
+ }
+ } else {
+ $result=&mt('Invalid post number');
+ }
+ &redirect_back($r,$feedurl,$result.'<br />',
+ '0','0','','',$env{'form.previous'},undef,undef,undef,
undef,undef,undef,$group);
return OK;
} elsif ($env{'form.cmd'}=~/^(threadedoff|threadedon)$/) {
my ($symb,$feedurl)=&get_feedurl_and_clean_symb($env{'form.symb'});
- if ($env{'form.cmd'} eq 'threadedon') {
- &Apache::lonnet::put('environment',{'threadeddiscussion' => 'on'});
- &Apache::lonnet::appenv('environment.threadeddiscussion' => 'on');
+ if ($env{'form.cmd'} eq 'threadedoff') {
+ &Apache::lonnet::put('environment',{'unthreadeddiscussion' => 'on'});
+ &Apache::lonnet::appenv({'environment.unthreadeddiscussion' => 'on'});
+ &Apache::lonnet::del('environment',['threadeddiscussion']);
+ &Apache::lonnet::delenv('environment.threadeddiscussion');
} else {
- &Apache::lonnet::del('environment',['threadeddiscussion']);
- &Apache::lonnet::delenv('environment\.threadeddiscussion');
+ &Apache::lonnet::put('environment',{'threadeddiscussion' => 'on'});
+ &Apache::lonnet::appenv({'environment.threadeddiscussion' => 'on'});
+ &Apache::lonnet::del('environment',['unthreadeddiscussion']);
+ &Apache::lonnet::delenv('environment.unthreadeddiscussion');
}
&redirect_back($r,$feedurl,&mt('Changed discussion view mode').'<br />',
'0','0','','',$env{'form.previous'},undef,undef,undef,
@@ -3637,20 +4314,51 @@ ENDREDIR
# --------------------------------------------------------------- Hide for good
my ($symb,$idx)=split(/\:\:\:/,$env{'form.deldisc'});
($symb,my $feedurl)=&get_feedurl_and_clean_symb($symb);
+ my $ressymb=&wrap_symb($symb);
+
+ unless (&can_see_hidden('',$ressymb,$feedurl,$group,$cdom,$cnum)) {
+ &redirect_back($r,$feedurl,&mt('Deletion not permitted').'<br />',
+ '0','0','','',$env{'form.previous'},'','','','',
+ undef,undef,$group);
+ return OK;
+ }
my %contrib=&Apache::lonnet::restore($symb,$env{'request.course.id'},
- $env{'course.'.$env{'request.course.id'}.'.domain'},
- $env{'course.'.$env{'request.course.id'}.'.num'});
+ $cdom,$cnum);
my ($changelast,$newlast) = &get_discussion_info($idx,%contrib);
if ($changelast) {
&Apache::lonnet::put('discussiontimes',{$symb => $newlast},
- $env{'course.'.$env{'request.course.id'}.'.domain'}, $env{'course.'.$env{'request.course.id'}.'.num'});
+ $cdom,$cnum);
}
my %newhash=('deleted' => $contrib{'deleted'}.".$idx.");
- &Apache::lonnet::store(\%newhash,$symb,$env{'request.course.id'},
- $env{'course.'.$env{'request.course.id'}.'.domain'},
- $env{'course.'.$env{'request.course.id'}.'.num'});
- &redirect_back($r,$feedurl,&mt('Changed discussion status').'<br />',
- '0','0','','',$env{'form.previous'},undef,undef,undef,
+
+ my $result;
+ if (&Apache::lonnet::store(\%newhash,$symb,$env{'request.course.id'},
+ $cdom,$cnum) eq 'ok') {
+ $result = &mt('Changed discussion status');
+ my $prefix=$symb.':'.$idx.':';
+ my %likes=&Apache::lonnet::dump('disclikes',$cdom,$cnum,
+ '^'.$prefix);
+ my ($totallikes,$totalunlikes);
+ if (ref($likes{$prefix.'likers'}) eq 'HASH') {
+ $totallikes = scalar(keys(%{$likes{$prefix.'likers'}}));
+ }
+ if (ref($likes{$prefix.'unlikers'}) eq 'HASH') {
+ $totalunlikes = scalar(keys(%{$likes{$prefix.'unlikers'}}));
+ }
+ if ($totallikes || $totalunlikes) {
+ my $chglikes = -1 * $totallikes;
+ my $chgunlikes = -1 * $totalunlikes;
+ &storediscussionlikes($chglikes,$chgunlikes,
+ $contrib{$idx.':sendername'},
+ $contrib{$idx.':senderdomain'},
+ $env{'request.course.id'},
+ 'delete');
+ }
+ } else {
+ $result = &mt('Discussion status unchanged');
+ }
+ &redirect_back($r,$feedurl,$result.'<br />','0','0','','',
+ $env{'form.previous'},undef,undef,undef,
undef,undef,undef,$group);
return OK;
} elsif ($env{'form.preview'}) {
@@ -3662,13 +4370,15 @@ ENDREDIR
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['subject','comment','addnewattach','delnewattach','timestamp','numoldver','idx','discuss','blog']);
- my (@currnewattach,@currdelold,@keepold);
+ my (@currnewattach,@currdelold,@keepold,$toolarge);
&process_attachments(\@currnewattach,\@currdelold,\@keepold);
if (exists($env{'form.addnewattach.filename'})) {
- unless (length($env{'form.addnewattach'})>131072) {
+ if (length($env{'form.addnewattach'})<=$attachmax{'num'}) {
my $subdir = 'feedback/'.$env{'form.timestamp'};
my $newattachment=&Apache::lonnet::userfileupload('addnewattach',undef,$subdir);
push(@currnewattach, $newattachment);
+ } else {
+ $toolarge = '<p><span class="LC_warning">'.&mt('Attachment not included - exceeded permitted length').'</span><br /></p>';
}
}
my $attachmenturls;
@@ -3676,12 +4386,11 @@ ENDREDIR
my $idx = $env{'form.idx'};
if ($idx) {
my %contrib=&Apache::lonnet::restore($symb,$env{'request.course.id'},
- $env{'course.'.$env{'request.course.id'}.'.domain'},
- $env{'course.'.$env{'request.course.id'}.'.num'});
+ $cdom,$cnum);
$attachmenturls = $contrib{$idx.':attachmenturl'};
}
&modify_attachments($r,\@currnewattach,\@currdelold,$symb,$idx,
- $attachmenturls);
+ $attachmenturls,$attachmax{'text'},$toolarge);
return OK;
} elsif ($env{'form.export'}) {
&Apache::loncommon::content_type($r,'text/html');
@@ -3690,10 +4399,11 @@ ENDREDIR
my $mode='board';
my $status='OPEN';
my $previous=$env{'form.previous'};
- if ($feedurl =~ /\.(problem|exam|quiz|assess|survey|form|library|task)$/) {
+ if ($feedurl =~ /$LONCAPA::assess_re/) {
$mode='problem';
$status=$Apache::inputtags::status[-1];
}
+
my $discussion = &list_discussion($mode,$status,$symb);
my $start_page =
&Apache::loncommon::start_page('Resource Feedback and Discussion');
@@ -3701,10 +4411,60 @@ ENDREDIR
&Apache::loncommon::end_page();
$r->print($start_page.$discussion.$end_page);
return OK;
+
+ } elsif ($env{'form.undeleteall'}) {
+ &Apache::loncommon::content_type($r,'text/html');
+ $r->send_http_header;
+ my ($symb,$feedurl) = &get_feedurl_and_clean_symb($env{'form.undeleteall'});
+ my $ressymb=&wrap_symb($symb);
+ $r->print(&Apache::loncommon::start_page('Undelete all deleted discussion entries'));
+ if (&can_see_hidden('',$ressymb,$feedurl,$group,$cdom,$cnum)) {
+ my %contrib=&Apache::lonnet::restore($symb,$env{'request.course.id'},
+ $cdom,$cnum);
+ $contrib{'deleted'} =~ s/^\.//;
+ $contrib{'deleted'} =~ s/\.$//;
+ if ($contrib{'deleted'} ne '') {
+ if (&Apache::lonnet::store({'deleted' => ''},$symb,$env{'request.course.id'},
+ $cdom,$cnum) eq 'ok') {
+ my %likes=&Apache::lonnet::dump('disclikes',$cdom,$cnum,'^'.$symb.':');
+ my @ids = split(/\.\./,$contrib{'deleted'});
+ my (%chglikes,%chgunlikes);
+ foreach my $idx (@ids) {
+ my $uname = $contrib{$idx.':sendername'};
+ my $udom = $contrib{$idx.':senderdomain'};
+ my ($totallikes,$totalunlikes);
+ if (ref($likes{$symb.':'.$idx.':likers'}) eq 'HASH') {
+ $totallikes = scalar(keys(%{$likes{$symb.':'.$idx.':likers'}}));
+ }
+ if (ref($likes{$symb.':'.$idx.':unlikers'}) eq 'HASH') {
+ $totalunlikes = scalar(keys(%{$likes{$symb.':'.$idx.':unlikers'}}));
+ }
+ if ($totallikes || $totalunlikes) {
+ $chglikes{$uname.':'.$udom} += $totallikes;
+ $chgunlikes{$uname.':'.$udom} += $totalunlikes;
+ }
+ }
+ foreach my $user (keys(%chglikes)) {
+ my ($uname,$udom) = split(/:/,$user);
+ &storediscussionlikes($chglikes{$user},$chgunlikes{$user},
+ $uname,$udom,$env{'request.course.id'},
+ 'undelete');
+ }
+ $r->print(&Apache::lonhtmlcommon::confirm_success(&mt("Undeleted all entries")));
+ } else {
+ $r->print(&Apache::lonhtmlcommon::confirm_success(&mt("Failed to undelete entries"),1));
+ }
+ } else {
+ $r->print(&Apache::lonhtmlcommon::confirm_success(&mt("No entries to undelete"),1));
+ }
+ $r->print("<br /><a href='$feedurl'>".&mt("Return and reload")."</a>");
+ }
+ $r->print(&Apache::loncommon::end_page());
+ return OK;
} else {
# ------------------------------------------------------------- Normal feedback
my $feedurl=$env{'form.postdata'};
- $feedurl=~s/^http\:\/\///;
+ $feedurl=~s/^https?\:\/\///;
$feedurl=~s/^$ENV{'SERVER_NAME'}//;
$feedurl=~s/^$ENV{'HTTP_HOST'}//;
$feedurl=~s/\?.+$//;
@@ -3712,31 +4472,29 @@ ENDREDIR
my $symb;
if ($env{'form.replydisc'}) {
$symb=(split(/\:\:\:/,$env{'form.replydisc'}))[0];
- my ($map,$id,$url)=&Apache::lonnet::decode_symb($symb);
- $feedurl=&Apache::lonnet::clutter($url);
} elsif ($env{'form.editdisc'}) {
$symb=(split(/\:\:\:/,$env{'form.editdisc'}))[0];
- my ($map,$id,$url)=&Apache::lonnet::decode_symb($symb);
- $feedurl=&Apache::lonnet::clutter($url);
} elsif ($env{'form.origpage'}) {
$symb="";
+ } elsif ($env{'form.sendmessageonly'}) {
+ $symb=(split(/\:\:\:/,$env{'form.sendmessageonly'}))[0];
} else {
$symb=&Apache::lonnet::symbread($feedurl);
}
unless ($symb) {
$symb=$env{'form.symb'};
- if ($symb) {
- my ($map,$id,$url)=&Apache::lonnet::decode_symb($symb);
- $feedurl=&Apache::lonnet::clutter($url);
- }
}
- &Apache::lonenc::check_decrypt(\$symb);
+ if (defined($symb)) {
+ ($symb,$feedurl)=&get_feedurl_and_clean_symb($symb);
+ } else {
+ # backward compatibility (bulletin boards used to be 'wrapped')
+ &Apache::lonenc::check_decrypt(\$feedurl);
+ &dewrapper(\$feedurl);
+ }
my $goahead=1;
- if ($feedurl=~/\.(problem|exam|quiz|assess|survey|form|task)$/) {
+ if ($feedurl=~/$LONCAPA::assess_re/) {
unless ($symb) { $goahead=0; }
}
- # backward compatibility (bulletin boards used to be 'wrapped')
- &dewrapper(\$feedurl);
if (!$goahead) {
# Ambiguous Problem Resource
$r->internal_redirect('/adm/ambiguous');
@@ -3755,16 +4513,26 @@ ENDREDIR
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
# Unable to give feedback
+ &Apache::lonenc::check_encrypt(\$feedurl);
&no_redirect_back($r,$feedurl);
return OK;
}
# --------------------------------------------------- Print login screen header
unless ($env{'form.sendit'}) {
+ &Apache::lonenc::check_encrypt(\$feedurl);
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
- my $options=&screen_header($feedurl,$symb);
+ if (($env{'form.replydisc'}) || ($env{'form.editdisc'})) {
+ my ($blocked,$blocktext) =
+ &Apache::loncommon::blocking_status('boards');
+ if ($blocked) {
+ $r->print(&blocked_reply_or_edit($blocktext));
+ return OK;
+ }
+ }
+ my $options=&screen_header($feedurl,$symb,$group);
if ($options) {
- &mail_screen($r,$feedurl,$options);
+ &mail_screen($r,$feedurl,$options,$symb,$attachmax{'text'});
} else {
&fail_redirect($r,$feedurl);
}
@@ -3777,16 +4545,20 @@ ENDREDIR
$env{'request.course.id'});
# Get output from resource
+ &Apache::lonenc::check_encrypt(\$feedurl);
my $usersaw=&resource_output($feedurl);
# Get resource answer (need to allow student to view grades for this to work)
- &Apache::lonnet::appenv(('allowed.vgr'=>'F'));
- my $useranswer=&Apache::loncommon::get_student_answers(
- $symb,$env{'user.name'},$env{'user.domain'},
- $env{'request.course.id'});
+ &Apache::lonnet::appenv({'allowed.vgr'=>'F'});
+ my $usersymb = &Apache::lonenc::check_encrypt($symb);
+ my $useranswer=
+ &Apache::loncommon::get_student_answers(
+ $usersymb,$env{'user.name'},$env{'user.domain'},
+ $env{'request.course.id'});
&Apache::lonnet::delenv('allowed.vgr');
# Get attachments, if any, and not too large
my $attachmenturl='';
+ my $toolarge='';
if (($env{'form.origpage'}) || ($env{'form.editdisc'}) ||
($env{'form.replydisc'})) {
my ($symb,$idx);
@@ -3805,35 +4577,42 @@ ENDREDIR
$symb=~s|(bulletin___\d+___)adm/wrapper/|$1|;
$attachmenturl=&construct_attachmenturl(\@currnewattach,\@keepold,$symb,$idx);
} elsif ($env{'form.attachment.filename'}) {
- unless (length($env{'form.attachment'})>131072) {
- $attachmenturl=&Apache::lonnet::userfileupload('attachment',undef,'feedback');
- }
+ if (length($env{'form.attachment'})<=$attachmax{'num'}) {
+ my $now = time;
+ my $subdir = 'feedback/'.$now;
+ $attachmenturl=&Apache::lonnet::userfileupload('attachment',undef,$subdir);
+ } else {
+ $toolarge = '<p><span class="LC_warning">'.&mt('Attachment not included - exceeded permitted length').'</span><br /></p>';
+ }
}
# Filter HTML out of message (could be nasty)
- my $message=&clear_out_html($env{'form.comment'});
+ my $override;
+ if ($env{'form.discuss'} =~ /^(?:author|question|course|policy)$/) {
+ $override = 1;
+ }
+ my $message=&clear_out_html($env{'form.comment'},$override);
# Assemble email
- my ($email,$citations)=&assemble_email($feedurl,$message,$prevattempts,
+ my ($email,$citations)=&assemble_email($message,$prevattempts,
$usersaw,$useranswer);
# Who gets this?
- my ($typestyle,%to) = &decide_receiver($feedurl);
+ my ($typestyle,%to) = &Apache::lonmsg::decide_receiver($feedurl);
# Actually send mail
- my ($status,$numsent)=&send_msg(&clear_out_html($env{'form.subject'},
- undef,1),
+ my ($status,$numsent)=&send_msg(&clear_out_html($env{'form.subject'}),
$feedurl,$email,$citations,
- $attachmenturl,%to);
+ $attachmenturl,$usersymb,%to);
# Discussion? Store that.
my $numpost=0;
if ( ($env{'form.discuss'} ne ''
&& $env{'form.discuss'} !~ /^(?:author|question|course|policy)/)
|| $env{'form.anondiscuss'} ne '') {
- my $subject = &clear_out_html($env{'form.subject'},undef,1);
+ my $subject = &clear_out_html($env{'form.subject'});
my $anonmode=($env{'form.discuss'} eq 'anon' || $env{'form.anondiscuss'} );
$typestyle.=&adddiscuss($symb,$message,$anonmode,$attachmenturl,
- $subject);
+ $subject,$group);
$numpost++;
}
@@ -3841,18 +4620,31 @@ ENDREDIR
my $blog='';
if ($env{'form.blog'}) {
- my $subject = &clear_out_html($env{'form.subject'},undef,1);
+ my $subject = &clear_out_html($env{'form.subject'});
$status.=&Apache::lonrss::addentry($env{'user.name'},
$env{'user.domain'},
'CourseBlog_'.$env{'request.course.id'},
$subject,$message,$feedurl,'public');
- $blog='<br />'.&mt('Added to my course blog').'<br />';
+ if (&Apache::loncommon::course_type() eq 'Community') {
+ $blog='<br />'.&mt('Added to my community blog').'<br />';
+ } else {
+ $blog='<br />'.&mt('Added to my course blog').'<br />';
+ }
}
# Receipt screen and redirect back to where came from
- &redirect_back($r,$feedurl,$typestyle,$numsent,$numpost,$blog,$status,$env{'form.previous'},undef,undef,undef,undef,undef,undef,$group);
+ &redirect_back($r,$feedurl,$typestyle,$numsent,$numpost,$blog,$status,$env{'form.previous'},undef,undef,undef,undef,undef,undef,$group,$toolarge);
}
return OK;
+}
+
+sub blocked_reply_or_edit {
+ my ($blocktext) = @_;
+ return
+ &Apache::loncommon::start_page('Resource Feedback and Discussion').
+ $blocktext.'<br /><br /><a href="javascript:history.go(-1)">'.
+ &mt('Back to previous page').
+ &Apache::loncommon::end_page();
}
sub wrap_symb {
@@ -3864,6 +4656,7 @@ sub wrap_symb {
}
return $ressymb;
}
+
sub dewrapper {
my ($feedurl)=@_;
if ($$feedurl=~m|^/adm/wrapper/adm/.*/bulletinboard$|) {
@@ -3957,5 +4750,170 @@ sub group_args {
return $extra_args;
}
+sub get_resource_title {
+ my ($symb,$feedurl) = @_;
+ my ($restitle,$plainurl);
+ if (defined($symb)) {
+ my $plain_symb = &Apache::lonenc::check_decrypt($symb);
+ $restitle = &Apache::lonnet::gettitle($plain_symb);
+ }
+ if (defined($feedurl)) {
+ $plainurl = &Apache::lonenc::check_decrypt($feedurl);
+ }
+ if (!defined($restitle)) {
+ if (defined($feedurl)) {
+ $restitle = &Apache::lonnet::gettitle($plainurl);
+ }
+ }
+ if ($plainurl ne $feedurl) {
+ my ($plain_filename) = ($plainurl =~ m-/([^/]+)$-);
+ if ($plain_filename eq $restitle) {
+ $restitle = &mt('Untitled resource');
+ }
+ }
+ if ($restitle eq '') {
+ $restitle = &mt('Untitled resource');
+ }
+ return $restitle;
+}
+
1;
__END__
+
+
+=pod
+
+=head1 NAME
+
+Apache::lonfeedback.pm
+
+=head1 SYNOPSIS
+
+Handles feedback from students to instructors and system administrators.
+
+Provides a screenshot of the current resource, as well as previous attempts if the resource was a homework.
+
+Used by lonmsg.pm.
+
+This is part of the LearningOnline Network with CAPA project
+described at http://www.lon-capa.org.
+
+=head1 OVERVIEW
+
+None
+
+=head1 SUBROUTINES
+
+=over
+
+=item discussion_open()
+
+=item discussion_visible()
+
+=item discussion_vote_available()
+
+=item get_realsymb()
+
+=item list_discussion()
+
+=item can_see_hidden()
+
+=item discussion_link()
+
+=item send_feedback_link()
+
+=item send_message_link()
+
+=item action_links_bar()
+
+=item postingform_display()
+
+=item build_posting_display
+
+=item filter_regexp()
+
+=item get_post_contents()
+
+=item replicate_attachments()
+
+=item mail_screen()
+
+=item print_display_options()
+
+=item print_sortfilter_options()
+
+=item print_showposters()
+
+=item get_post_versions()
+
+=item get_post_attachments()
+
+=item fail_redirect()
+
+=item redirect_back()
+
+=item no_redirect_back()
+
+=item screen_header()
+
+=item resource_output()
+
+=item clear_out_html()
+
+=item assemble_email()
+
+=item feedback_available()
+
+=item send_msg()
+
+=item adddiscuss()
+
+=item get_discussion_info()
+
+=item show_preview()
+
+=item newline_to_br()
+
+=item tidy_html()
+
+=item generate_preview_button()
+
+=item modify_attachments()
+
+=item process_attachments()
+
+=item generate_attachments_button()
+
+=item extract_attachments()
+
+=item construct_attachmenturl()
+
+=item add_blog_checkbox()
+
+=item has_discussion()
+
+=item sort_filter_names()
+
+=item handler()
+
+=item blocked_reply_or_edit()
+
+=item wrap_symb()
+
+=item dewrapper()
+
+=item get_feedurl()
+
+=item get_feedurl_and_clean_symb()
+
+=item editing_allowed()
+
+=item check_group_priv()
+
+=item group_args()
+
+=item get_resource_title()
+
+=back
+
+=cut