version 1.284, 2010/01/21 23:13:50
|
version 1.288, 2010/01/25 03:10:19
|
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 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 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 2646 sub screen_header {
|
Line 2653 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 2950 sub show_preview {
|
Line 2957 sub show_preview {
|
} |
} |
|
|
sub contains_block_html { |
sub contains_block_html { |
my ($message)=@_; |
my ($message)=@_; |
return ($message =~ m/ |
return ($message =~ m{ |
<(br|h1|h2|h3|h4|h5|h6|p|ol|ul|table|pre|address|blockquote|center|div) |
<(br|h1|h2|h3|h4|h5|h6|p|ol|ul|table|pre|address|blockquote|center|div) |
[\s]* |
\s* |
([\w]+\=['"][\w]+['"])* |
(\w+\=['"]\w+['"])* |
[\s]* |
\s* |
( |
( |
[\s]*[\/]>| |
\s*/>| |
>.*<\/\1[\s]*> |
>.*</\1\s*> |
)/xs ); |
)}xs |
|
); |
} |
} |
|
|
sub tidy_html { |
sub tidy_html { |