version 1.273.4.6, 2010/01/25 03:56:00
|
version 1.273.4.12, 2010/11/20 01:33:04
|
Line 48 use LONCAPA;
|
Line 48 use LONCAPA;
|
|
|
sub discussion_open { |
sub discussion_open { |
my ($status,$symb)=@_; |
my ($status,$symb)=@_; |
|
# Advanced roles can always discuss |
if ($env{'request.role.adv'}) { return 1; } |
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) && |
if (defined($status) && |
!($status eq 'CAN_ANSWER' || $status eq 'CANNOT_ANSWER' |
!($status eq 'CAN_ANSWER' || $status eq 'CANNOT_ANSWER' |
|| $status eq 'OPEN')) { |
|| $status eq 'OPEN')) { |
return 0; |
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) { |
if (defined($close) && $close ne '' && $close < time) { |
return 0; |
return 0; |
} |
} |
Line 400 sub list_discussion {
|
Line 409 sub list_discussion {
|
my $manifestfilename = $tempexport.$manifest; |
my $manifestfilename = $tempexport.$manifest; |
if ($manifestfile = Apache::File->new('>'.$manifestfilename)) { |
if ($manifestfile = Apache::File->new('>'.$manifestfilename)) { |
$manifestok=1; |
$manifestok=1; |
print $manifestfile qq| |
print $manifestfile qq|<?xml version="1.0" encoding="UTF-8"?> |
<?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" |
<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" |
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" |
identifier="MANIFEST-$ressymb" xsi:schemaLocation="http://www.imsglobal.org/xsd/imscp_v1p1 |
identifier="MANIFEST-$ressymb" xsi:schemaLocation="http://www.imsglobal.org/xsd/imscp_v1p1 |
Line 528 imscp_v1p1.xsd http://www.imsglobal.org/
|
Line 537 imscp_v1p1.xsd http://www.imsglobal.org/
|
print $manifestfile "\n". |
print $manifestfile "\n". |
'<item identifier="ITEM-'.$ressymb.'-'.$alldiscussion{$post}.'" isvisible="'. |
'<item identifier="ITEM-'.$ressymb.'-'.$alldiscussion{$post}.'" isvisible="'. |
$imsitems{$alldiscussion{$post}}{'isvisible'}.'" identifieref="RES-'.$ressymb.'-'.$alldiscussion{$post}.'">'. |
$imsitems{$alldiscussion{$post}}{'isvisible'}.'" identifieref="RES-'.$ressymb.'-'.$alldiscussion{$post}.'">'. |
'<title>'.$imsitems{$alldiscussion{$post}}{'title'}.'</title>'; |
'<title>'.$imsitems{$alldiscussion{$post}}{'title'}.'</title></item>'; |
$imsresources .= "\n". |
$imsresources .= "\n". |
'<resource identifier="RES-'.$ressymb.'-'.$alldiscussion{$post}.'" type="webcontent" href="'.$postfilename.'">'."\n". |
'<resource identifier="RES-'.$ressymb.'-'.$alldiscussion{$post}.'" type="webcontent" href="'.$postfilename.'">'."\n". |
'<file 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>'; |
'</resource>'; |
} |
} |
my $postingfile; |
my $postingfile; |
Line 718 END
|
Line 727 END
|
$attachnum += @{$currnewattach}; |
$attachnum += @{$currnewattach}; |
} |
} |
} |
} |
if (&discussion_open($status)) { |
if ((&discussion_open($status)) && ($outputtarget ne 'tex')) { |
if (($group ne '') && ($mode eq 'board')) { |
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 .= |
$discussion .= |
&postingform_display($mode,$ressymb,$now,$subject, |
&postingform_display($mode,$ressymb,$now,$subject, |
$comment,$outputtarget,$attachnum, |
$comment,$outputtarget,$attachnum, |
Line 728 END
|
Line 738 END
|
$group,$crstype); |
$group,$crstype); |
} |
} |
} else { |
} else { |
$discussion.= |
if (&Apache::lonnet::allowed('pch',$env{'request.course.id'}. |
&postingform_display($mode,$ressymb,$now,$subject, |
($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''))) { |
$comment,$outputtarget,$attachnum, |
|
$currnewattach,$currdelold,'',$crstype); |
$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>'; |
|
} |
} |
} |
} |
} |
|
if (!(&discussion_open($status)) && ($outputtarget ne 'tex')) { |
|
$discussion.= '<span class="LC_feedback_link">'. |
|
&mt('This discussion is closed.').'</span>'; |
|
} |
} else { |
} else { |
$discussion.='<div class="LC_feedback_link">'; |
$discussion.='<div class="LC_feedback_link">'; |
if (&discussion_open($status) && |
if (&discussion_open($status) && |
Line 741 END
|
Line 762 END
|
$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); |
|
if ($env{'request.role.adv'}) { |
|
my $close = &Apache::lonnet::EXT('resource.0.discussend',$ressymb); |
|
if (defined($close) && $close ne '' && $close < time) { |
|
$discussion .= ' '.&mt('(Closed for [_1] roles)', |
|
&Apache::lonnet::plaintext('st',$crstype)); |
|
} |
|
} |
|
} |
|
} else { |
|
if ($outputtarget ne 'tex') { |
|
$discussion.= '<span class="LC_feedback_link">'.&mt('This discussion is closed.').'</span>'; |
} |
} |
} |
|
if ($outputtarget ne 'tex') { |
|
$discussion.= &send_message_link($ressymb); |
|
} |
} |
$discussion.='</div>'; |
$discussion.=&send_message_link($ressymb).'</div>'; |
} |
} |
return $discussion; |
return $discussion; |
} |
} |
Line 1172 sub build_posting_display {
|
Line 1201 sub build_posting_display {
|
$$imsitems{$idx}{'attach'}=$attachtxt{$numoldver}; |
$$imsitems{$idx}{'attach'}=$attachtxt{$numoldver}; |
$$imsitems{$idx}{'timestamp'}=$contrib{$idx.':timestamp'}; |
$$imsitems{$idx}{'timestamp'}=$contrib{$idx.':timestamp'}; |
$$imsitems{$idx}{'sender'}=$plainname.' ('. |
$$imsitems{$idx}{'sender'}=$plainname.' ('. |
$contrib{$idx.':sendername'}.' at '. |
$contrib{$idx.':sendername'}.':'. |
$contrib{$idx.':senderdomain'}.')'; |
$contrib{$idx.':senderdomain'}.')'; |
$$imsitems{$idx}{'isanonymous'}='false'; |
$$imsitems{$idx}{'isanonymous'}='false'; |
if ($contrib{$idx.':anonymous'}) { |
if ($contrib{$idx.':anonymous'}) { |
Line 1369 sub get_post_contents {
|
Line 1398 sub get_post_contents {
|
$$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'}.')'; |
my $attachmenturls = $$contrib{$idx.':attachmenturl'}; |
my $attachmenturls = $$contrib{$idx.':attachmenturl'}; |
my @postversions = (); |
my @postversions = (); |
Line 1397 sub get_post_contents {
|
Line 1426 sub get_post_contents {
|
my ($timesent,$attachmsg); |
my ($timesent,$attachmsg); |
my %currattach = (); |
my %currattach = (); |
$timesent = &Apache::lonlocal::locallocaltime($postversions[$i]); |
$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}); |
$$messages{$i}=&Apache::lontexconvert::msgtexconverted($$messages{$i}); |
$$subjects{$i}=~s/\n/\<br \/\>/g; |
$$subjects{$i}=~s/\n/\<br \/\>/g; |
$$subjects{$i}=&Apache::lontexconvert::msgtexconverted($$subjects{$i}); |
$$subjects{$i}=&Apache::lontexconvert::msgtexconverted($$subjects{$i}); |
Line 1411 sub get_post_contents {
|
Line 1442 sub get_post_contents {
|
foreach my $key (sort(keys(%currattach))) { |
foreach my $key (sort(keys(%currattach))) { |
if ($$allattachments{$key}{'filename'} =~ m-^/uploaded/([^/]+/[^/]+)(/feedback)?(/?\d*)/([^/]+)$-) { |
if ($$allattachments{$key}{'filename'} =~ m-^/uploaded/([^/]+/[^/]+)(/feedback)?(/?\d*)/([^/]+)$-) { |
my $fname = $1.$3.'/'.$4; |
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 />'; |
$$attachtxt{$i}.= '<a href="'.$fname.'">'.$4.'</a><br />'; |
} |
} |
} |
} |
Line 1671 END
|
Line 1702 END
|
{'add_entries' => \%onload}); |
{'add_entries' => \%onload}); |
|
|
if ($quote ne '') { |
if ($quote ne '') { |
&newline_to_br(\$quote); |
$quote = &HTML::Entities::decode($quote); |
|
unless (&contains_block_html($quote)) { |
|
&newline_to_br(\$quote); |
|
} |
$quote='<blockquote>'.&Apache::lontexconvert::msgtexconverted($quote).'</blockquote>'; |
$quote='<blockquote>'.&Apache::lontexconvert::msgtexconverted($quote).'</blockquote>'; |
} |
} |
|
|
Line 1705 $lt{'title'}: <input type="text" name="s
|
Line 1739 $lt{'title'}: <input type="text" name="s
|
<p> |
<p> |
<textarea name="comment" id="comment" cols="60" rows="10">$comment |
<textarea name="comment" id="comment" cols="60" rows="10">$comment |
</textarea></p> |
</textarea></p> |
<p> |
|
END |
END |
if ( ($env{'form.editdisc'}) || ($env{'form.replydisc'}) ) { |
if ( ($env{'form.editdisc'}) || ($env{'form.replydisc'}) ) { |
if ($env{'form.origpage'}) { |
if ($env{'form.origpage'}) { |
Line 1727 END
|
Line 1760 END
|
} |
} |
} else { |
} else { |
$r->print(<<END); |
$r->print(<<END); |
|
<p> |
$lt{'atta'} $attachmaxtext: <input type="file" name="attachment" /> |
$lt{'atta'} $attachmaxtext: <input type="file" name="attachment" /> |
</p> |
</p> |
END |
END |
Line 2230 sub print_showposters {
|
Line 2264 sub print_showposters {
|
my $group = $env{'form.group'}; |
my $group = $env{'form.group'}; |
my $ressymb = &wrap_symb($symb); |
my $ressymb = &wrap_symb($symb); |
if (($group ne '') && |
if (($group ne '') && |
($ressymb =~ m|^bulletin___ \d+___adm/wrapper/adm/\Q$cdom\E/\Q$cnum\E/\d+/bulletinboard$|)) { |
($ressymb =~ m|^bulletin___\d+___adm/wrapper/adm/\Q$cdom\E/\Q$cnum\E/\d+/bulletinboard$|)) { |
if (&check_group_priv($group,'dgp') eq 'ok') { |
if (&check_group_priv($group,'dgp') eq 'ok') { |
$seeid = 1; |
$seeid = 1; |
} |
} |
Line 2571 ENDNOREDIRTWO
|
Line 2605 ENDNOREDIRTWO
|
} |
} |
|
|
sub screen_header { |
sub screen_header { |
my ($feedurl,$symb) = @_; |
my ($feedurl,$symb,$group) = @_; |
my $crscontent = &mt('Question/Comment/Feedback about course content'); |
my $crscontent = &mt('Question/Comment/Feedback about course content'); |
my $crspolicy = &mt('Question/Comment/Feedback about course policy'); |
my $crspolicy = &mt('Question/Comment/Feedback about course policy'); |
my $contribdisc = &mt('Contribution to course discussion of resource'); |
my $contribdisc = &mt('Contribution to course discussion of resource'); |
Line 2620 sub screen_header {
|
Line 2654 sub screen_header {
|
} |
} |
if (($env{'request.course.id'}) && (!$env{'form.sendmessageonly'})) { |
if (($env{'request.course.id'}) && (!$env{'form.sendmessageonly'})) { |
my ($blocked,$blocktext) = &Apache::loncommon::blocking_status('boards'); |
my ($blocked,$blocktext) = &Apache::loncommon::blocking_status('boards'); |
if (!$blocked && &discussion_open(undef,$symb) && |
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
&Apache::lonnet::allowed('pch', |
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
$env{'request.course.id'}. |
my $realsymb = $symb; |
($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''))) { |
if ($symb=~/^bulletin___/) { |
|
my $filename=(&Apache::lonnet::decode_symb($symb))[2]; |
|
$filename=~s|^adm/wrapper/||; |
|
$realsymb=&Apache::lonnet::symbread($filename); |
|
} |
|
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" /> '. |
$discussoptions='<label><input type="radio" name="discuss" value="nonanon" checked="checked" /> '. |
$contribdisc. |
$contribdisc. |
'</label><br /><label><input type="radio" name="discuss" value="anon" /> '. |
'</label><br /><label><input type="radio" name="discuss" value="anon" /> '. |
Line 2643 sub screen_header {
|
Line 2686 sub screen_header {
|
.$msgoptions; |
.$msgoptions; |
} |
} |
if ($discussoptions) { |
if ($discussoptions) { |
$discussoptions='<h2><img src="'.&Apache::loncommon::lonhttpdurl('/adm/lonMisc/chat.gif').'" />' |
$discussoptions='<h2><img src="'.&Apache::loncommon::lonhttpdurl('/adm/lonMisc/chat.gif').'" alt="" />' |
.' '.&mt('Discussion Contributions').'</h2><p>'.&Apache::lonhtmlcommon::coursepreflink(&mt('Discussion Settings'),'discussion').'</p>' |
.' '.&mt('Discussion Contributions').'</h2><p>'.&Apache::lonhtmlcommon::coursepreflink(&mt('Discussion Settings'),'discussion').'</p>' |
.$discussoptions; |
.$discussoptions; |
} |
} |
Line 2675 sub clear_out_html {
|
Line 2718 sub clear_out_html {
|
($override)) { |
($override)) { |
# allows <B> <I> <P> <A> <LI> <OL> <UL> <EM> <BR> <TT> <STRONG> |
# allows <B> <I> <P> <A> <LI> <OL> <UL> <EM> <BR> <TT> <STRONG> |
# <BLOCKQUOTE> <DIV .*> <DIV> <IMG> <M> <SPAN> <H1> <H2> <H3> <H4> <SUB> |
# <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, |
%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, |
BR=>1, TT=>1, STRONG=>1, BLOCKQUOTE=>1, DIV=>1, IMG=>1, |
M=>1, ALGEBRA=>1, SUB=>1, SUP=>1, SPAN=>1, |
M=>1, ALGEBRA=>1, SUB=>1, SUP=>1, SPAN=>1, |
H1=>1, H2=>1, H3=>1, H4=>1, H5=>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 |
# Do the substitution of everything that is not explicitly allowed |
$message =~ s/\<(\/?\s*(\w+)[^\>\<]*)/ |
$message =~ s/\<(\/?\s*(\w+)[^\>\<]*)/ |
Line 2761 sub send_msg {
|
Line 2806 sub send_msg {
|
} |
} |
|
|
sub adddiscuss { |
sub adddiscuss { |
my ($symb,$email,$anon,$attachmenturl,$subject)=@_; |
my ($symb,$email,$anon,$attachmenturl,$subject,$group)=@_; |
my $status=''; |
my $status=''; |
my $realsymb; |
my $realsymb; |
if ($symb=~/^bulletin___/) { |
if ($symb=~/^bulletin___/) { |
Line 2769 sub adddiscuss {
|
Line 2814 sub adddiscuss {
|
$filename=~s|^adm/wrapper/||; |
$filename=~s|^adm/wrapper/||; |
$realsymb=&Apache::lonnet::symbread($filename); |
$realsymb=&Apache::lonnet::symbread($filename); |
} |
} |
|
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) && |
if (&discussion_open(undef,$realsymb) && |
&Apache::lonnet::allowed('pch',$env{'request.course.id'}. |
(&Apache::lonnet::allowed('pch',$env{'request.course.id'}. |
($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''))) { |
($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, |
my %contrib=('message' => $email, |
'sendername' => $env{'user.name'}, |
'sendername' => $env{'user.name'}, |
Line 3798 ENDREDIR
|
Line 3850 ENDREDIR
|
return OK; |
return OK; |
} |
} |
} |
} |
my $options=&screen_header($feedurl,$symb); |
my $options=&screen_header($feedurl,$symb,$group); |
if ($options) { |
if ($options) { |
&mail_screen($r,$feedurl,$options,$symb,$attachmax{'text'}); |
&mail_screen($r,$feedurl,$options,$symb,$attachmax{'text'}); |
} else { |
} else { |
Line 3877 ENDREDIR
|
Line 3929 ENDREDIR
|
my $subject = &clear_out_html($env{'form.subject'},undef,1); |
my $subject = &clear_out_html($env{'form.subject'},undef,1); |
my $anonmode=($env{'form.discuss'} eq 'anon' || $env{'form.anondiscuss'} ); |
my $anonmode=($env{'form.discuss'} eq 'anon' || $env{'form.anondiscuss'} ); |
$typestyle.=&adddiscuss($symb,$message,$anonmode,$attachmenturl, |
$typestyle.=&adddiscuss($symb,$message,$anonmode,$attachmenturl, |
$subject); |
$subject,$group); |
$numpost++; |
$numpost++; |
} |
} |
|
|