version 1.247, 2007/05/02 01:33:49
|
version 1.255.2.6, 2009/03/18 02:49:39
|
Line 91 sub list_discussion {
|
Line 91 sub list_discussion {
|
if (not &discussion_visible($status)) { |
if (not &discussion_visible($status)) { |
if ($mode ne 'board') { |
if ($mode ne 'board') { |
&Apache::lonenc::check_encrypt(\$ressymb); |
&Apache::lonenc::check_encrypt(\$ressymb); |
return &send_message_link($ressymb); |
return '<br />'.&send_message_link($ressymb); |
} |
} |
} |
} |
if ($group ne '' && $mode eq 'board') { |
if ($group ne '' && $mode eq 'board') { |
Line 625 END
|
Line 625 END
|
$filterchoice .= ' '.$role_types{$role}.','; |
$filterchoice .= ' '.$role_types{$role}.','; |
} |
} |
$filterchoice =~ s/,$//; |
$filterchoice =~ s/,$//; |
$filterchoice .= '<br />     '; |
$filterchoice .= '<br />'.(' ' x8); |
} |
} |
if ($statusfilter) { |
if ($statusfilter) { |
$filterchoice .= '<i>'.&mt('status').'</i>- '.$status_types{$statusfilter}; |
$filterchoice .= '<i>'.&mt('status').'</i>- '.$status_types{$statusfilter}; |
Line 732 END
|
Line 732 END
|
} |
} |
} |
} |
} else { |
} else { |
$discussion.='<table class="LC_feedback_link"><tr><td>'; |
$discussion.='<div class="LC_feedback_link">'; |
if (&discussion_open($status) && |
if (&discussion_open($status) && |
&Apache::lonnet::allowed('pch', |
&Apache::lonnet::allowed('pch', |
$env{'request.course.id'}. |
$env{'request.course.id'}. |
($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''))) { |
($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''))) { |
if ($outputtarget ne 'tex') { |
if ($outputtarget ne 'tex') { |
$discussion.= &send_feedback_link($ressymb,$target). |
$discussion.= &send_feedback_link($ressymb,$target); |
'<br />'; |
|
} |
} |
} |
} |
if ($outputtarget ne 'tex') { |
if ($outputtarget ne 'tex') { |
$discussion.= &send_message_link($ressymb); |
$discussion.= &send_message_link($ressymb); |
} |
} |
$discussion.='</td></tr></table>'; |
$discussion.='</div>'; |
} |
} |
return $discussion; |
return $discussion; |
} |
} |
Line 763 sub send_feedback_link {
|
Line 762 sub send_feedback_link {
|
|
|
sub send_message_link { |
sub send_message_link { |
my ($ressymb) = @_; |
my ($ressymb) = @_; |
my $output = '<span class="LC_feedback_link">'. |
my $output = '<span class="LC_message_link">'. |
' <a href="/adm/feedback?sendmessageonly=1&symb='. |
' <a href="/adm/feedback?sendmessageonly=1&symb='. |
&escape($ressymb).'"><img alt="" src="'. |
&escape($ressymb).'"><img alt="" src="'. |
&Apache::loncommon::lonhttpdurl('/adm/lonMisc/feedback.gif'). |
&Apache::loncommon::lonhttpdurl('/adm/lonMisc/feedback.gif'). |
Line 795 sub action_links_bar {
|
Line 794 sub action_links_bar {
|
$discussion .= '&previous='.$prevread; |
$discussion .= '&previous='.$prevread; |
} |
} |
$discussion .= &group_args($group); |
$discussion .= &group_args($group); |
$discussion .='">'.&mt('Sorting/Filtering options').'</a>  '; |
$discussion .='">'.&mt('Sorting/Filtering options').'</a>'.(' ' x2); |
} else { |
} else { |
$discussion .= '<td align="left">'; |
$discussion .= '<td align="left">'; |
} |
} |
Line 901 sub build_posting_display {
|
Line 900 sub build_posting_display {
|
$env{'course.'.$env{'request.course.id'}.'.domain'}, |
$env{'course.'.$env{'request.course.id'}.'.domain'}, |
$env{'course.'.$env{'request.course.id'}.'.num'}); |
$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}))) { |
if ((@{$grouppick} == 0) || (grep(/^all$/,@{$grouppick}))) { |
$skip_group_check = 1; |
$skip_group_check = 1; |
} |
} |
Line 1001 sub build_posting_display {
|
Line 1003 sub build_posting_display {
|
@{$$subjectsort{$subject}} = ("$idx"); |
@{$$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( |
$sender=&Apache::loncommon::aboutmewrapper( |
$plainname, |
$plainname, |
$contrib{$idx.':sendername'}, |
$contrib{$idx.':sendername'}, |
$contrib{$idx.':senderdomain'}).' ('. |
$contrib{$idx.':senderdomain'}).' ('. |
$contrib{$idx.':sendername'}.' at '. |
$contrib{$idx.':sendername'}.':'. |
$contrib{$idx.':senderdomain'}.')'; |
$contrib{$idx.':senderdomain'}.')'; |
if ($contrib{$idx.':anonymous'}) { |
if ($contrib{$idx.':anonymous'}) { |
$sender.=' <font color="red"><b>['.$$anonhash{$key}.']</b></font> '. |
$sender.=' <font color="red"><b>['.$$anonhash{$key}.']</b></font> '. |
$screenname; |
$screenname; |
} |
} |
$sender.=&Apache::loncommon::student_image_tag($contrib{$idx.':senderdomain'},$contrib{$idx.':sendername'}); |
if ($see_anonymous) { |
|
$sender.=&Apache::loncommon::student_image_tag($contrib{$idx.':senderdomain'},$contrib{$idx.':sendername'}); |
|
} |
# Set up for sorting by domain, then username |
# Set up for sorting by domain, then username |
unless (defined($$usernamesort{$contrib{$idx.':senderdomain'}})) { |
unless (defined($$usernamesort{$contrib{$idx.':senderdomain'}})) { |
%{$$usernamesort{$contrib{$idx.':senderdomain'}}} = (); |
%{$$usernamesort{$contrib{$idx.':senderdomain'}}} = (); |
Line 1236 sub build_posting_display {
|
Line 1240 sub build_posting_display {
|
$$newitem{$idx} = 1; |
$$newitem{$idx} = 1; |
$$discussionitems[$idx] .= ' |
$$discussionitems[$idx] .= ' |
<p><table border="0" width="100%"> |
<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 { |
} else { |
$$newitem{$idx} = 0; |
$$newitem{$idx} = 0; |
$$discussionitems[$idx] .= ' |
$$discussionitems[$idx] .= ' |
Line 1468 sub replicate_attachments {
|
Line 1472 sub replicate_attachments {
|
} |
} |
|
|
sub mail_screen { |
sub mail_screen { |
my ($r,$feedurl,$options,$caller_symb) = @_; |
my ($r,$feedurl,$options,$caller_symb,$attachmaxtext) = @_; |
if (exists($env{'form.origpage'})) { |
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']); |
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['subject','comment','currnewattach','addnewattach','deloldattach','delnewattach','timestamp','idx','anondiscuss','discuss','blog','group','ref']); |
} |
} |
Line 1478 sub mail_screen {
|
Line 1482 sub mail_screen {
|
'myqu' => 'My question/comment/feedback:', |
'myqu' => 'My question/comment/feedback:', |
'title' => 'Title', |
'title' => 'Title', |
'reta' => 'Retained attachments', |
'reta' => 'Retained attachments', |
'atta' => 'Attachment (128 KB max size)', |
'atta' => 'Attachment', |
); |
); |
my $restitle = &get_resource_title($caller_symb,$feedurl); |
my $restitle = &get_resource_title($caller_symb,$feedurl); |
my $quote=''; |
my $quote=''; |
Line 1614 END
|
Line 1618 END
|
$comment = &unescape($env{'form.comment'}); |
$comment = &unescape($env{'form.comment'}); |
&process_attachments(\@currnewattach,\@currdelold,\@keepold); |
&process_attachments(\@currnewattach,\@currdelold,\@keepold); |
} |
} |
my $latexHelp=&Apache::loncommon::helpLatexCheatsheet(); |
my $latexHelp=&Apache::loncommon::helpLatexCheatsheet(undef,undef,1); |
my $send=&mt('Send'); |
my $send=&mt('Send'); |
my $alert = &mt('Please select a feedback type.'); |
my $alert = &mt('Please select a feedback type.'); |
my $js= <<END; |
my $js= <<END; |
Line 1717 END
|
Line 1721 END
|
} |
} |
} else { |
} else { |
$r->print(<<END); |
$r->print(<<END); |
$lt{'atta'}: <input type="file" name="attachment" /> |
$lt{'atta'} $attachmaxtext: <input type="file" name="attachment" /> |
</p> |
</p> |
END |
END |
} |
} |
Line 1791 sub print_display_options {
|
Line 1795 sub print_display_options {
|
'actn' => 'Action', |
'actn' => 'Action', |
'deff' => 'Default for all discussions', |
'deff' => 'Default for all discussions', |
'prca' => 'Preferences can be set for this discussion that determine ....', |
'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', |
'unwh' => 'Under what circumstances posts are identified as "NEW", and', |
'wipa' => 'Whether individual posts can be marked as read/unread', |
'wipa' => 'Whether individual posts can be marked as read/unread', |
'allposts' => 'All posts', |
'allposts' => 'All posts', |
'unread' => 'New posts only', |
'unread' => 'New posts only', |
'unmark' => 'Posts not marked read', |
'unmark' => 'Posts not marked read', |
'ondisp' => 'Once displayed', |
'ondisp' => 'Once displayed', |
'onmark' => 'Once marked not NEW ', |
'onmark' => 'Once marked not NEW', |
'toggon' => 'Shown', |
'toggon' => 'Shown', |
'toggoff' => 'Not shown', |
'toggoff' => 'Not shown', |
'disa' => 'Posts displayed?', |
'disa' => 'Posts displayed?', |
Line 1956 END
|
Line 1960 END
|
<td>$lt{$disctogg}</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 |
END |
|
my $save = &mt('Save'); |
$r->print(&Apache::loncommon::end_data_table_row()); |
$r->print(&Apache::loncommon::end_data_table_row()); |
$r->print(&Apache::loncommon::end_data_table()); |
$r->print(&Apache::loncommon::end_data_table()); |
$r->print(<<END); |
$r->print(<<END); |
Line 1967 END
|
Line 1972 END
|
<input type="hidden" name="$dispchgB" value=""/> |
<input type="hidden" name="$dispchgB" value=""/> |
<input type="hidden" name="$markchg" value=""/> |
<input type="hidden" name="$markchg" value=""/> |
<input type="hidden" name="$toggchg" value="" /> |
<input type="hidden" name="$toggchg" value="" /> |
<input type="button" name="sub" value="Save Changes" onClick="javascript:setDisp()" /> |
<input type="button" name="sub" value="$save" onClick="javascript:setDisp()" /> |
END |
END |
if (exists($env{'form.group'})) { |
if (exists($env{'form.group'})) { |
$r->print('<input type="hidden" name="group" value="'.$env{'form.group'}.'" />'); |
$r->print('<input type="hidden" name="group" value="'.$env{'form.group'}.'" />'); |
Line 2147 $start_page
|
Line 2152 $start_page
|
</td> |
</td> |
<td> </td> |
<td> </td> |
<td align="center" valign="top"> |
<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="all">$role_types{'all'}</option> |
<option value="st">$role_types{'st'}</option> |
<option value="st">$role_types{'st'}</option> |
<option value="cc">$role_types{'cc'}</option> |
<option value="cc">$role_types{'cc'}</option> |
Line 2159 $start_page
|
Line 2164 $start_page
|
</td> |
</td> |
<td> </td> |
<td> </td> |
<td align="center" valign="top"> |
<td align="center" valign="top"> |
<select name="sectionpick" multiple="true" size="$numvisible"> |
<select name="sectionpick" multiple="multiple" size="$numvisible"> |
$section_sel |
$section_sel |
</select> |
</select> |
</td> |
</td> |
<td> </td> |
<td> </td> |
<td align="center" valign="top"> |
<td align="center" valign="top"> |
<select name="grouppick" multiple="true" size="$numvisible"> |
<select name="grouppick" multiple="multiple" size="$numvisible"> |
$group_sel |
$group_sel |
</select> |
</select> |
</td> |
</td> |
Line 2386 ENDFAILREDIR
|
Line 2391 ENDFAILREDIR
|
} |
} |
|
|
sub redirect_back { |
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 $sorttag = ''; |
my $roletag = ''; |
my $roletag = ''; |
my $statustag = ''; |
my $statustag = ''; |
Line 2500 $start_page
|
Line 2505 $start_page
|
$typestyle |
$typestyle |
<b>Sent $sendsomething message(s), and $sendposts post(s).</b> |
<b>Sent $sendsomething message(s), and $sendposts post(s).</b> |
$blog |
$blog |
|
$toolarge |
<font color="red">$status</font> |
<font color="red">$status</font> |
<form name="reldt" action="$feedurl" target="loncapaclient"> |
<form name="reldt" action="$feedurl" target="loncapaclient"> |
$prevtag |
$prevtag |
Line 2883 sub show_preview {
|
Line 2889 sub show_preview {
|
|
|
my $end_page = &Apache::loncommon::end_page(); |
my $end_page = &Apache::loncommon::end_page(); |
|
|
$r->print($start_page.'<table border="2"><tr><td>'. |
$r->print($start_page |
'<b>'.&mt('Subject').':</b> '.$subject.'<br /><br />'. |
.'<h1>'.&mt('Preview').'</h1>' |
$message.'</td></tr></table>'.$end_page); |
.&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 |
|
); |
} |
} |
|
|
|
|
Line 2927 ENDPREVIEW
|
Line 2942 ENDPREVIEW
|
} |
} |
|
|
sub modify_attachments { |
sub modify_attachments { |
my ($r,$currnewattach,$currdelold,$symb,$idx,$attachmenturls)=@_; |
my ($r,$currnewattach,$currdelold,$symb,$idx,$attachmenturls, |
|
$attachmaxtext,$toolarge)=@_; |
|
|
my %lt = &Apache::lonlocal::texthash( |
my %lt = &Apache::lonlocal::texthash( |
'subj' => 'Subject', |
'subj' => 'Subject', |
Line 2969 END
|
Line 2985 END
|
|
|
$r->print(<<END); |
$r->print(<<END); |
$start_page |
$start_page |
|
$toolarge |
<form name="modattachments" method="post" enctype="multipart/form-data" action="/adm/feedback?attach=$symb"> |
<form name="modattachments" method="post" enctype="multipart/form-data" action="/adm/feedback?attach=$symb"> |
<table border="2"> |
<br /> |
|
<table class="LC_data_table"> |
<tr> |
<tr> |
<td> |
<td colspan="2"> |
<b>Subject:</b> $subject</b><br /><br /> |
<b>Subject:</b> $subject</b><br /><br /> |
END |
END |
if ($idx) { |
if ($idx) { |
Line 2998 END
|
Line 3016 END
|
$r->print("<br />"); |
$r->print("<br />"); |
} |
} |
$r->print(<<END); |
$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> |
</td> |
</tr> |
</tr> |
|
<tr> |
|
<td colspan="2">$attachmaxtext</td> |
|
</tr> |
</table> |
</table> |
<input type="hidden" name="subject" value="$env{'form.subject'}" /> |
<input type="hidden" name="subject" value="$env{'form.subject'}" /> |
<input type="hidden" name="comment" value="$env{'form.comment'}" /> |
<input type="hidden" name="comment" value="$env{'form.comment'}" /> |
Line 3232 function setblogvalue() {
|
Line 3256 function setblogvalue() {
|
sub has_discussion { |
sub has_discussion { |
my $resourcesref = shift; |
my $resourcesref = shift; |
my $navmap = Apache::lonnavmaps::navmap->new(); |
my $navmap = Apache::lonnavmaps::navmap->new(); |
my @allres=$navmap->retrieveResources(); |
if (defined($navmap)) { |
foreach my $resource (@allres) { |
my @allres=$navmap->retrieveResources(); |
if ($resource->hasDiscussion()) { |
foreach my $resource (@allres) { |
my $ressymb = $resource->wrap_symb(); |
if ($resource->hasDiscussion()) { |
push(@{$resourcesref}, $ressymb); |
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; |
return; |
} |
} |
Line 3283 sub handler {
|
Line 3313 sub handler {
|
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, |
&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']); |
['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 $group = $env{'form.group'}; |
|
my %attachmax = ( |
|
text => '(128 KB max size)', |
|
num => 131072, |
|
); |
if ($env{'form.editdisc'}) { |
if ($env{'form.editdisc'}) { |
if (!(&editing_allowed($env{'form.editdisc'},$env{'form.group'}))) { |
if (!(&editing_allowed($env{'form.editdisc'},$env{'form.group'}))) { |
my $symb=(split(/\:\:\:/,$env{'form.editdisc'}))[0]; |
my $symb=(split(/\:\:\:/,$env{'form.editdisc'}))[0]; |
Line 3410 sub handler {
|
Line 3444 sub handler {
|
my %lt = &Apache::lonlocal::texthash( |
my %lt = &Apache::lonlocal::texthash( |
'mnpa' => 'Marked "New" posts as read in a total of', |
'mnpa' => 'Marked "New" posts as read in a total of', |
'robb' => 'resources/bulletin boards.', |
'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) { |
foreach my $res (@resources) { |
my $ressymb=$res; |
my $ressymb=$res; |
Line 3553 ENDREDIR
|
Line 3587 ENDREDIR
|
my ($symb,$feedurl)=&get_feedurl_and_clean_symb($env{'form.symb'}); |
my ($symb,$feedurl)=&get_feedurl_and_clean_symb($env{'form.symb'}); |
if ($env{'form.cmd'} eq 'threadedon') { |
if ($env{'form.cmd'} eq 'threadedon') { |
&Apache::lonnet::put('environment',{'threadeddiscussion' => 'on'}); |
&Apache::lonnet::put('environment',{'threadeddiscussion' => 'on'}); |
&Apache::lonnet::appenv('environment.threadeddiscussion' => 'on'); |
&Apache::lonnet::appenv({'environment.threadeddiscussion' => 'on'}); |
} else { |
} else { |
&Apache::lonnet::del('environment',['threadeddiscussion']); |
&Apache::lonnet::del('environment',['threadeddiscussion']); |
&Apache::lonnet::delenv('environment\.threadeddiscussion'); |
&Apache::lonnet::delenv('environment\.threadeddiscussion'); |
Line 3591 ENDREDIR
|
Line 3625 ENDREDIR
|
&Apache::loncommon::content_type($r,'text/html'); |
&Apache::loncommon::content_type($r,'text/html'); |
$r->send_http_header; |
$r->send_http_header; |
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['subject','comment','addnewattach','delnewattach','timestamp','numoldver','idx','discuss','blog']); |
&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); |
&process_attachments(\@currnewattach,\@currdelold,\@keepold); |
if (exists($env{'form.addnewattach.filename'})) { |
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 $subdir = 'feedback/'.$env{'form.timestamp'}; |
my $newattachment=&Apache::lonnet::userfileupload('addnewattach',undef,$subdir); |
my $newattachment=&Apache::lonnet::userfileupload('addnewattach',undef,$subdir); |
push(@currnewattach, $newattachment); |
push(@currnewattach, $newattachment); |
|
} else { |
|
$toolarge = '<p><span class="LC_warning">'.&mt('Attachment not included - exceeded permitted length').'</span><br /></p>'; |
} |
} |
} |
} |
my $attachmenturls; |
my $attachmenturls; |
Line 3610 ENDREDIR
|
Line 3646 ENDREDIR
|
$attachmenturls = $contrib{$idx.':attachmenturl'}; |
$attachmenturls = $contrib{$idx.':attachmenturl'}; |
} |
} |
&modify_attachments($r,\@currnewattach,\@currdelold,$symb,$idx, |
&modify_attachments($r,\@currnewattach,\@currdelold,$symb,$idx, |
$attachmenturls); |
$attachmenturls,$attachmax{'text'},$toolarge); |
return OK; |
return OK; |
} elsif ($env{'form.export'}) { |
} elsif ($env{'form.export'}) { |
&Apache::loncommon::content_type($r,'text/html'); |
&Apache::loncommon::content_type($r,'text/html'); |
Line 3633 ENDREDIR
|
Line 3669 ENDREDIR
|
} else { |
} else { |
# ------------------------------------------------------------- Normal feedback |
# ------------------------------------------------------------- Normal feedback |
my $feedurl=$env{'form.postdata'}; |
my $feedurl=$env{'form.postdata'}; |
$feedurl=~s/^http\:\/\///; |
$feedurl=~s/^https?\:\/\///; |
$feedurl=~s/^$ENV{'SERVER_NAME'}//; |
$feedurl=~s/^$ENV{'SERVER_NAME'}//; |
$feedurl=~s/^$ENV{'HTTP_HOST'}//; |
$feedurl=~s/^$ENV{'HTTP_HOST'}//; |
$feedurl=~s/\?.+$//; |
$feedurl=~s/\?.+$//; |
Line 3699 ENDREDIR
|
Line 3735 ENDREDIR
|
} |
} |
my $options=&screen_header($feedurl,$symb); |
my $options=&screen_header($feedurl,$symb); |
if ($options) { |
if ($options) { |
&mail_screen($r,$feedurl,$options,$symb); |
&mail_screen($r,$feedurl,$options,$symb,$attachmax{'text'}); |
} else { |
} else { |
&fail_redirect($r,$feedurl); |
&fail_redirect($r,$feedurl); |
} |
} |
Line 3716 ENDREDIR
|
Line 3752 ENDREDIR
|
my $usersaw=&resource_output($feedurl); |
my $usersaw=&resource_output($feedurl); |
|
|
# Get resource answer (need to allow student to view grades for this to work) |
# Get resource answer (need to allow student to view grades for this to work) |
&Apache::lonnet::appenv(('allowed.vgr'=>'F')); |
&Apache::lonnet::appenv({'allowed.vgr'=>'F'}); |
my $usersymb = &Apache::lonenc::check_encrypt($symb); |
my $usersymb = &Apache::lonenc::check_encrypt($symb); |
my $useranswer= |
my $useranswer= |
&Apache::loncommon::get_student_answers( |
&Apache::loncommon::get_student_answers( |
Line 3725 ENDREDIR
|
Line 3761 ENDREDIR
|
&Apache::lonnet::delenv('allowed.vgr'); |
&Apache::lonnet::delenv('allowed.vgr'); |
# Get attachments, if any, and not too large |
# Get attachments, if any, and not too large |
my $attachmenturl=''; |
my $attachmenturl=''; |
|
my $toolarge=''; |
if (($env{'form.origpage'}) || ($env{'form.editdisc'}) || |
if (($env{'form.origpage'}) || ($env{'form.editdisc'}) || |
($env{'form.replydisc'})) { |
($env{'form.replydisc'})) { |
my ($symb,$idx); |
my ($symb,$idx); |
Line 3743 ENDREDIR
|
Line 3780 ENDREDIR
|
$symb=~s|(bulletin___\d+___)adm/wrapper/|$1|; |
$symb=~s|(bulletin___\d+___)adm/wrapper/|$1|; |
$attachmenturl=&construct_attachmenturl(\@currnewattach,\@keepold,$symb,$idx); |
$attachmenturl=&construct_attachmenturl(\@currnewattach,\@keepold,$symb,$idx); |
} elsif ($env{'form.attachment.filename'}) { |
} elsif ($env{'form.attachment.filename'}) { |
unless (length($env{'form.attachment'})>131072) { |
if (length($env{'form.attachment'})<=$attachmax{'num'}) { |
$attachmenturl=&Apache::lonnet::userfileupload('attachment',undef,'feedback'); |
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) |
# Filter HTML out of message (could be nasty) |
my $message=&clear_out_html($env{'form.comment'}); |
my $message=&clear_out_html($env{'form.comment'}); |
Line 3788 ENDREDIR
|
Line 3829 ENDREDIR
|
} |
} |
|
|
# Receipt screen and redirect back to where came from |
# 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; |
return OK; |
} |
} |