--- loncom/interface/lonfeedback.pm 2006/12/11 18:50:40 1.236
+++ loncom/interface/lonfeedback.pm 2009/04/24 13:02:09 1.270
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Feedback
#
-# $Id: lonfeedback.pm,v 1.236 2006/12/11 18:50:40 raeburn Exp $
+# $Id: lonfeedback.pm,v 1.270 2009/04/24 13:02:09 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -91,7 +91,7 @@ sub list_discussion {
if (not &discussion_visible($status)) {
if ($mode ne 'board') {
&Apache::lonenc::check_encrypt(\$ressymb);
- return &send_message_link($ressymb);
+ return '<br />'.&send_message_link($ressymb);
}
}
if ($group ne '' && $mode eq 'board') {
@@ -110,7 +110,7 @@ sub list_discussion {
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 ''; }
@@ -434,7 +434,8 @@ 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 class="LC_discussion">';
$discussion .= &action_links_bar($colspan,$ressymb,$visible,
$newpostsflag,$group,
$prevread,$markondisp);
@@ -547,7 +548,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>';
}
@@ -557,8 +558,8 @@ imscp_v1p1.xsd http://www.imsglobal.org/
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">
+ <td colspan="$colspan" class="LC_disc_action_links_bar">
+ <table class="LC_disc_action_table">
<tr>
<td align="left">
<table border="0" cellpadding="0" cellspacing="4">
@@ -625,7 +626,7 @@ END
$filterchoice .= ' '.$role_types{$role}.',';
}
$filterchoice =~ s/,$//;
- $filterchoice .= '<br />     ';
+ $filterchoice .= '<br />'.(' ' x8);
}
if ($statusfilter) {
$filterchoice .= '<i>'.&mt('status').'</i>- '.$status_types{$statusfilter};
@@ -637,11 +638,11 @@ END
}
}
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);
@@ -732,20 +733,19 @@ END
}
}
} else {
- $discussion.='<table class="LC_feedback_link"><tr><td>';
+ $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.= &send_feedback_link($ressymb,$target).
- '<br />';
+ $discussion.= &send_feedback_link($ressymb,$target);
}
}
if ($outputtarget ne 'tex') {
$discussion.= &send_message_link($ressymb);
}
- $discussion.='</td></tr></table>';
+ $discussion.='</div>';
}
return $discussion;
}
@@ -763,21 +763,21 @@ sub send_feedback_link {
sub send_message_link {
my ($ressymb) = @_;
- my $output = '<span class="LC_feedback_link">'.
+ my $output = '<span class="LC_message_link">'.
' <a href="/adm/feedback?sendmessageonly=1&symb='.
&escape($ressymb).'"><img alt="" src="'.
- &Apache::loncommon::lonhttpdurl('/adm/lonMisc/feedback.gif').
+ &Apache::loncommon::lonhttpdurl('/res/adm/pages/com.png').
'" border="0" />'.&mt('Send Message').'</a></span>';
return $output;
}
sub action_links_bar {
my ($colspan,$ressymb,$visible,$newpostsflag,$group,$prevread,$markondisp) = @_;
- my $discussion = '<tr><td bgcolor="#DDDDBB" colspan="'.$colspan.'">'.
- '<table border="0" width="100%" bgcolor="#DDDDBB"><tr>';
+ my $discussion = '<tr><td class="LC_disc_action_links_bar" colspan="'.$colspan.'">'.
+ '<table width="100%" class="LC_disc_action_table"><tr>';
my $escsymb=&escape($ressymb);
if ($visible>2) {
- $discussion .= '<td align="left">'.
+ $discussion .= '<td class="LC_disc_action_left">'.
'<a href="/adm/feedback?cmd=threadedon&symb='.$escsymb;
if ($newpostsflag) {
$discussion .= '&previous='.$prevread;
@@ -795,9 +795,9 @@ sub action_links_bar {
$discussion .= '&previous='.$prevread;
}
$discussion .= &group_args($group);
- $discussion .='">'.&mt('Sorting/Filtering options').'</a>  ';
+ $discussion .='">'.&mt('Sorting/Filtering options').'</a>'.(' ' x2);
} else {
- $discussion .= '<td align="left">';
+ $discussion .= '<td class="LC_disc_action_left>';
}
$discussion .='<a href= "/adm/feedback?export='.$escsymb;
if ($newpostsflag) {
@@ -807,7 +807,7 @@ sub action_links_bar {
$discussion .= '">'.&mt('Export').'?</a> </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').
@@ -901,6 +901,9 @@ sub build_posting_display {
$env{'course.'.$env{'request.course.id'}.'.domain'},
$env{'course.'.$env{'request.course.id'}.'.num'});
+ 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;
}
@@ -1001,18 +1004,20 @@ 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'}:'')))) {
+ if (!$contrib{$idx.':anonymous'} || $see_anonymous) {
$sender=&Apache::loncommon::aboutmewrapper(
$plainname,
$contrib{$idx.':sendername'},
$contrib{$idx.':senderdomain'}).' ('.
- $contrib{$idx.':sendername'}.' at '.
+ $contrib{$idx.':sendername'}.':'.
$contrib{$idx.':senderdomain'}.')';
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'}}} = ();
@@ -1236,7 +1241,7 @@ sub build_posting_display {
$$newitem{$idx} = 1;
$$discussionitems[$idx] .= '
<p><table border="0" width="100%">
- <tr><td align="left"><font color="#FF0000"><b>NEW</b></font></td>';
+ <tr><td align="left"><font color="#FF0000"><b>'.&mt('NEW').'</b></font></td>';
} else {
$$newitem{$idx} = 0;
$$discussionitems[$idx] .= '
@@ -1468,7 +1473,7 @@ 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']);
}
@@ -1478,10 +1483,9 @@ sub mail_screen {
'myqu' => 'My question/comment/feedback:',
'title' => 'Title',
'reta' => 'Retained attachments',
- 'atta' => 'Attachment (128 KB max size)',
- );
- my $title=&Apache::lonnet::gettitle($feedurl);
- if (!$title) { $title = $feedurl; }
+ 'atta' => 'Attachment',
+ );
+ my $restitle = &get_resource_title($caller_symb,$feedurl);
my $quote='';
my $subject = '';
my $comment = '';
@@ -1615,7 +1619,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);
my $send=&mt('Send');
my $alert = &mt('Please select a feedback type.');
my $js= <<END;
@@ -1669,7 +1673,7 @@ END
$r->print(<<END);
$start_page
-<h2><tt>$title</tt></h2>
+<h2><tt>$restitle</tt></h2>
<form action="/adm/feedback" method="post" name="mailform"
enctype="multipart/form-data">
$prevtag
@@ -1692,6 +1696,8 @@ $quote
<p>$lt{'myqu'}</p>
<p>
$latexHelp
+</p>
+<p>
$lt{'title'}: <input type="text" name="subject" size="30" value="$subject" /></p>
<p>
<textarea name="comment" id="comment" cols="60" rows="10" wrap="hard">$comment
@@ -1718,7 +1724,7 @@ END
}
} else {
$r->print(<<END);
-$lt{'atta'}: <input type="file" name="attachment" />
+$lt{'atta'} $attachmaxtext: <input type="file" name="attachment" />
</p>
END
}
@@ -1792,14 +1798,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?',
@@ -1957,6 +1963,7 @@ END
<td>$lt{$disctogg}</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);
@@ -1964,11 +1971,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'}.'" />');
@@ -2056,7 +2063,7 @@ 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 = ();
@@ -2148,7 +2155,7 @@ $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>
@@ -2160,13 +2167,13 @@ $start_page
</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>
@@ -2387,7 +2394,7 @@ ENDFAILREDIR
}
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 = '';
@@ -2471,7 +2478,8 @@ sub redirect_back {
}
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'}.'" />';
@@ -2501,6 +2509,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
@@ -2560,26 +2569,31 @@ sub screen_header {
'<p><label><input type="radio" name="discuss" value="author" /> '.
&mt('Feedback to resource author').'</label></p>';
}
+ my %optionhash=();
+ foreach my $type ('question','comment','policy') {
+ $optionhash{$type}=$env{'course.'.$env{'request.course.id'}.'.'.$type.'.email.text'};
+ }
if (&feedback_available(1)) {
$msgoptions.=
'<p><label><input type="radio" name="discuss" value="question" /> '.
- &mt('Question about resource content').'</label></p>';
+ ($optionhash{'question'}?$optionhash{'question'}:&mt('Question about resource content')).'</label></p>';
}
if (&feedback_available(0,1)) {
$msgoptions.=
'<p><label><input type="radio" name="discuss" value="course" /> '.
- &mt('Question/Comment/Feedback about course content').
+ ($optionhash{'comment'}?$optionhash{'comment'}:&mt('Question/Comment/Feedback about course content')).
'</label></p>';
}
if (&feedback_available(0,0,1)) {
$msgoptions.=
'<p><label><input type="radio" name="discuss" value="policy" /> '.
- &mt('Question/Comment/Feedback about course policy').
+ ($optionhash{'policy'}?$optionhash{'policy'}:&mt('Question/Comment/Feedback about course policy')).
'</label></p>';
}
}
if (($env{'request.course.id'}) && (!$env{'form.sendmessageonly'})) {
- if (&discussion_open(undef,$symb) &&
+ my ($blocked,$blocktext) = &Apache::loncommon::blocking_status('boards');
+ if (!$blocked && &discussion_open(undef,$symb) &&
&Apache::lonnet::allowed('pch',
$env{'request.course.id'}.
($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''))) {
@@ -2589,13 +2603,13 @@ sub screen_header {
&mt('Anonymous contribution to course discussion of resource').
' <i>('.&mt('name only visible to course faculty').')</i></label> '.
'<a href="/adm/preferences?action=changescreenname">'.&mt('Change Screenname').'</a>';
- }
- my $blockblog = &Apache::loncommon::blocking_status('blogs');
- if (!$blockblog) {
- $discussoptions.= &add_blog_checkbox();
+ my $blockblog = &Apache::loncommon::blocking_status('blogs');
+ if (!$blockblog) {
+ $discussoptions.= &add_blog_checkbox();
+ }
}
}
- if ($msgoptions) { $msgoptions='<h2><img src="'.&Apache::loncommon::lonhttpdurl('/adm/lonMisc/feedback.gif').'" />'.&mt('Sending Messages').'</h2>'.$msgoptions; }
+ if ($msgoptions) { $msgoptions='<h2><img src="'.&Apache::loncommon::lonhttpdurl('/res/adm/pages/com.png').'" />'.&mt('Sending Messages').'</h2>'.$msgoptions; }
if ($discussoptions) {
$discussoptions='<h2><img src="'.&Apache::loncommon::lonhttpdurl('/adm/lonMisc/chat.gif').'" />'.&mt('Discussion Contributions').'</h2>'.$discussoptions; }
return $msgoptions.$discussoptions;
@@ -2641,7 +2655,7 @@ 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)',
@@ -2662,141 +2676,53 @@ ENDCITE
return ($email,$citations);
}
-sub secapply {
- my $rec=shift;
- my $defaultflag=shift;
- $rec=~s/\s+//g;
- $rec=~s/\@/\:/g;
- my ($adr,$sections_or_groups)=($rec=~/^([^\(]+)\(([^\)]+)\)/);
- if ($sections_or_groups) {
- foreach my $item (split(/\;/,$sections_or_groups)) {
- if (($item eq $env{'request.course.sec'}) ||
- ($defaultflag && ($item eq '*'))) {
- return $adr;
- } elsif ($env{'request.course.groups'}) {
- my @usersgroups = split(/:/,$env{'request.course.groups'});
- if (grep(/^\Q$item\E$/,@usersgroups)) {
- 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 />';
- }
+ 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);
}
sub adddiscuss {
@@ -2967,9 +2893,18 @@ sub show_preview {
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
+ );
}
@@ -3002,7 +2937,7 @@ 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();" />
@@ -3011,7 +2946,8 @@ 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',
@@ -3019,7 +2955,7 @@ sub modify_attachments {
'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',
+ 'stch' => 'Save Changes',
);
my $js = <<END;
<script type="text/javascript">
@@ -3053,10 +2989,12 @@ END
$r->print(<<END);
$start_page
+$toolarge
<form name="modattachments" method="post" enctype="multipart/form-data" action="/adm/feedback?attach=$symb">
- <table border="2">
+ <br />
+ <table class="LC_data_table">
<tr>
- <td>
+ <td colspan="2">
<b>Subject:</b> $subject</b><br /><br />
END
if ($idx) {
@@ -3082,9 +3020,15 @@ END
$r->print("<br />");
}
$r->print(<<END);
- $lt{'adda'} <input type="file" name="addnewattach" /><input type="button" name="upload" value="Upload" onClick="this.form.submit()" />
+ </td></tr>
+ <tr>
+ <td>
+ $lt{'adda'}</td><td><input type="file" name="addnewattach" /><input type="button" name="upload" value="Upload" onClick="this.form.submit()" />
</td>
</tr>
+ <tr>
+ <td colspan="2">$attachmaxtext</td>
+ </tr>
</table>
<input type="hidden" name="subject" value="$env{'form.subject'}" />
<input type="hidden" name="comment" value="$env{'form.comment'}" />
@@ -3102,7 +3046,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
@@ -3316,12 +3260,18 @@ function setblogvalue() {
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;
}
@@ -3367,6 +3317,10 @@ sub handler {
&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']);
my $group = $env{'form.group'};
+ my %attachmax = (
+ text => &mt('(128 KB max size)'),
+ num => 131072,
+ );
if ($env{'form.editdisc'}) {
if (!(&editing_allowed($env{'form.editdisc'},$env{'form.group'}))) {
my $symb=(split(/\:\:\:/,$env{'form.editdisc'}))[0];
@@ -3494,7 +3448,7 @@ sub handler {
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;
@@ -3637,10 +3591,10 @@ ENDREDIR
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');
+ &Apache::lonnet::appenv({'environment.threadeddiscussion' => 'on'});
} else {
&Apache::lonnet::del('environment',['threadeddiscussion']);
- &Apache::lonnet::delenv('environment\.threadeddiscussion');
+ &Apache::lonnet::delenv('environment.threadeddiscussion');
}
&redirect_back($r,$feedurl,&mt('Changed discussion view mode').'<br />',
'0','0','','',$env{'form.previous'},undef,undef,undef,
@@ -3675,13 +3629,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;
@@ -3694,7 +3650,7 @@ ENDREDIR
$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');
@@ -3717,7 +3673,7 @@ ENDREDIR
} 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/\?.+$//;
@@ -3725,12 +3681,8 @@ ENDREDIR
my $symb;
if ($env{'form.replydisc'}) {
$symb=(split(/\:\:\:/,$env{'form.replydisc'}))[0];
- my ($map,$id,$url)=&Apache::lonnet::decode_symb($symb);
- $feedurl=&Apache::lonnet::clutter($url);
} elsif ($env{'form.editdisc'}) {
$symb=(split(/\:\:\:/,$env{'form.editdisc'}))[0];
- my ($map,$id,$url)=&Apache::lonnet::decode_symb($symb);
- $feedurl=&Apache::lonnet::clutter($url);
} elsif ($env{'form.origpage'}) {
$symb="";
} else {
@@ -3738,18 +3690,18 @@ ENDREDIR
}
unless ($symb) {
$symb=$env{'form.symb'};
- if ($symb) {
- my ($map,$id,$url)=&Apache::lonnet::decode_symb($symb);
- $feedurl=&Apache::lonnet::clutter($url);
- }
}
- &Apache::lonenc::check_decrypt(\$symb);
+ if (defined($symb)) {
+ ($symb,$feedurl)=&get_feedurl_and_clean_symb($symb);
+ } else {
+ # backward compatibility (bulletin boards used to be 'wrapped')
+ &Apache::lonenc::check_decrypt(\$feedurl);
+ &dewrapper(\$feedurl);
+ }
my $goahead=1;
if ($feedurl=~/\.(problem|exam|quiz|assess|survey|form|task)$/) {
unless ($symb) { $goahead=0; }
}
- # backward compatibility (bulletin boards used to be 'wrapped')
- &dewrapper(\$feedurl);
if (!$goahead) {
# Ambiguous Problem Resource
$r->internal_redirect('/adm/ambiguous');
@@ -3787,7 +3739,7 @@ ENDREDIR
}
my $options=&screen_header($feedurl,$symb);
if ($options) {
- &mail_screen($r,$feedurl,$options);
+ &mail_screen($r,$feedurl,$options,$symb,$attachmax{'text'});
} else {
&fail_redirect($r,$feedurl);
}
@@ -3800,16 +3752,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);
@@ -3828,25 +3784,29 @@ 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'});
# 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),
$feedurl,$email,$citations,
- $attachmenturl,%to);
+ $attachmenturl,$usersymb,%to);
# Discussion? Store that.
my $numpost=0;
@@ -3873,7 +3833,7 @@ ENDREDIR
}
# 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;
}
@@ -3989,5 +3949,160 @@ 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 list_discussion()
+
+=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 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