version 1.282, 2009/12/08 13:33:12
|
version 1.290.2.1, 2010/05/27 14:34:41
|
Line 41 use Apache::lonnavmaps;
|
Line 41 use Apache::lonnavmaps;
|
use Apache::lonenc(); |
use Apache::lonenc(); |
use Apache::lonrss(); |
use Apache::lonrss(); |
use HTML::LCParser(); |
use HTML::LCParser(); |
|
#use HTML::Tidy::libXML; |
use Apache::lonspeller(); |
use Apache::lonspeller(); |
use Apache::longroup; |
use Apache::longroup; |
use Cwd; |
use Cwd; |
Line 402 sub list_discussion {
|
Line 403 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 529 imscp_v1p1.xsd http://www.imsglobal.org/
|
Line 529 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 769 sub send_message_link {
|
Line 769 sub send_message_link {
|
my $output = '<span class="LC_message_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="" class="LC_noBorder" src="'. |
&escape($ressymb).'"><img alt="" class="LC_noBorder" src="'. |
&Apache::loncommon::lonhttpdurl('/res/adm/pages/com.png'). |
&Apache::loncommon::lonhttpdurl('/res/adm/pages/feedback.png'). |
'" border="0" /><span class="LC_menubuttons_inline_text">'.&mt('Send Feedback').'</span></a></span>'; |
'" border="0" /><span class="LC_menubuttons_inline_text">'.&mt('Send Feedback').'</span></a></span>'; |
return $output; |
return $output; |
} |
} |
Line 1015 sub build_posting_display {
|
Line 1015 sub build_posting_display {
|
$contrib{$idx.':senderdomain'}).' ('. |
$contrib{$idx.':senderdomain'}).' ('. |
$contrib{$idx.':sendername'}.':'. |
$contrib{$idx.':sendername'}.':'. |
$contrib{$idx.':senderdomain'}.')'; |
$contrib{$idx.':senderdomain'}.')'; |
|
$sender = '<b>'.$sender.'</b>'; |
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; |
Line 1098 sub build_posting_display {
|
Line 1099 sub build_posting_display {
|
} else { |
} else { |
$sender='<i>'.$$anonhash{$key}.'</i>'; |
$sender='<i>'.$$anonhash{$key}.'</i>'; |
} |
} |
|
$sender = '<b>'.$sender.'</b>'; |
# Set up for sorting by domain, then username for anonymous |
# Set up for sorting by domain, then username for anonymous |
unless (defined($$usernamesort{'__anon'})) { |
unless (defined($$usernamesort{'__anon'})) { |
%{$$usernamesort{'__anon'}} = (); |
%{$$usernamesort{'__anon'}} = (); |
Line 1140 sub build_posting_display {
|
Line 1142 sub build_posting_display {
|
} |
} |
} |
} |
if ($viewgrades) { |
if ($viewgrades) { |
$vgrlink=&Apache::loncommon::submlink('Submissions', |
$vgrlink=&Apache::loncommon::submlink(&mt('Submissions'), |
$contrib{$idx.':sendername'},$contrib{$idx.':senderdomain'},$ressymb); |
$contrib{$idx.':sendername'},$contrib{$idx.':senderdomain'},$ressymb); |
} |
} |
if ($$dischash{$readkey}=~/\.$idx\./) { |
if ($$dischash{$readkey}=~/\.$idx\./) { |
Line 1254 sub build_posting_display {
|
Line 1256 sub build_posting_display {
|
} |
} |
$$discussionitems[$idx] .= '<td align="left"> '. |
$$discussionitems[$idx] .= '<td align="left"> '. |
'<b>'.$subject.'</b> '. |
'<b>'.$subject.'</b> '. |
'<b>'.$sender.'</b> '.$vgrlink.' ('. |
$sender.' '.$vgrlink.' ('. |
&Apache::lonlocal::locallocaltime($posttime).')</td>'; |
&Apache::lonlocal::locallocaltime($posttime).')</td>'; |
if ($$dischash{$toggkey}) { |
if ($$dischash{$toggkey}) { |
$$discussionitems[$idx].='<td align="right"> '. |
$$discussionitems[$idx].='<td align="right"> '. |
Line 1396 sub get_post_contents {
|
Line 1398 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 1410 sub get_post_contents {
|
Line 1414 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 1675 END
|
Line 1679 END
|
'bread_crumbs' => $brcrum,}); |
'bread_crumbs' => $brcrum,}); |
|
|
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 1709 $lt{'title'}: <input type="text" name="s
|
Line 1716 $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 1731 END
|
Line 1737 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 2395 sub fail_redirect {
|
Line 2402 sub fail_redirect {
|
my ($r,$feedurl) = @_; |
my ($r,$feedurl) = @_; |
if ($feedurl=~/^\/adm\//) { $feedurl.='?register=1' }; |
if ($feedurl=~/^\/adm\//) { $feedurl.='?register=1' }; |
my %lt = &Apache::lonlocal::texthash( |
my %lt = &Apache::lonlocal::texthash( |
'sorr' => 'Sorry, no recipients ...', |
'sorr' => 'Sorry, no recipients ...', |
); |
); |
my $logo=&Apache::loncommon::lonhttpdurl('/adm/lonIcons/lonlogos.gif'); |
my $logo=&Apache::loncommon::lonhttpdurl('/adm/lonIcons/lonlogos.gif'); |
$r->print(&Apache::loncommon::start_page('Feedback not sent',undef, |
$r->print(&Apache::loncommon::start_page('Feedback not sent',undef, |
Line 2542 ENDREDIR
|
Line 2549 ENDREDIR
|
|
|
sub no_redirect_back { |
sub no_redirect_back { |
my ($r,$feedurl) = @_; |
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; |
my %onload; |
if ($env{'environment.remote'} ne 'off') { |
if ($env{'environment.remote'} ne 'off') { |
Line 2641 sub screen_header {
|
Line 2648 sub screen_header {
|
} |
} |
} |
} |
if ($msgoptions) { |
if ($msgoptions) { |
$msgoptions='<h2><img src="'.&Apache::loncommon::lonhttpdurl('/res/adm/pages/com.png').'" />' |
$msgoptions='<h2><img src="'.&Apache::loncommon::lonhttpdurl('/res/adm/pages/feedback.png').'" />' |
.' '.&mt('Send Feedback').'</h2><p>'.&Apache::lonhtmlcommon::coursepreflink(&mt('Feedback Settings'),'feedback').'</p>' |
.' '.&mt('Send Feedback').'</h2><p>'.&Apache::lonhtmlcommon::coursepreflink(&mt('Feedback Settings'),'feedback').'</p>' |
.$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 2678 sub clear_out_html {
|
Line 2685 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 2949 sub show_preview {
|
Line 2957 sub show_preview {
|
} |
} |
|
|
sub contains_block_html { |
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 ($message)=@_; |
return ($message =~ m/ |
# my $tidy = HTML::Tidy::libXML->new(); |
<(br|h1|h2|h3|h4|h5|h6|p|ol|ul|table|pre|address|blockquote|center|div) |
# my $xhtml = $tidy->clean($message, 'utf-8', 1); |
[\s]* |
# $xhtml =~ m/<body>(.*)<\/body>/is; |
([\w]+\=['"][\w]+['"])* |
# my $clean = $1; |
[\s]* |
# # 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; |
[\s]*[\/]>| |
# $message=$clean; |
>.*<\/\1[\s]*> |
return $message; |
)/x ); |
|
} |
} |
|
|
sub newline_to_br { |
sub newline_to_br { |
my ($message)=@_; |
my ($message)=@_; |
my $newmessage; |
my $newmessage; |
Line 4145 None
|
Line 4166 None
|
|
|
=item newline_to_br() |
=item newline_to_br() |
|
|
|
=item tidy_html() |
|
|
=item generate_preview_button() |
=item generate_preview_button() |
|
|
=item modify_attachments() |
=item modify_attachments() |