--- loncom/interface/lonfeedback.pm 2009/11/04 17:45:49 1.278
+++ loncom/interface/lonfeedback.pm 2009/11/26 05:21:43 1.280
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Feedback
#
-# $Id: lonfeedback.pm,v 1.278 2009/11/04 17:45:49 raeburn Exp $
+# $Id: lonfeedback.pm,v 1.280 2009/11/26 05:21:43 faziophi Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1484,7 +1484,6 @@ sub mail_screen {
}
my %lt = &Apache::lonlocal::texthash(
- 'plch' => 'Please check at least one of the following feedback types:',
'myqu' => 'My question/comment/feedback:',
'title' => 'Title',
'reta' => 'Retained attachments',
@@ -1700,7 +1699,6 @@ END
END
}
$r->print(<
$lt{'myqu'}
@@ -2645,12 +2643,12 @@ sub screen_header { } if ($msgoptions) { $msgoptions=''.&Apache::lonhtmlcommon::coursepreflink(&mt('Feedback Settings'),'feedback').'
' .$msgoptions; } if ($discussoptions) { $discussoptions=''.&Apache::lonhtmlcommon::coursepreflink(&mt('Discussion Settings'),'discussion').'
' .$discussoptions; } return $msgoptions.$discussoptions; @@ -2951,7 +2949,19 @@ sub show_preview { ); } - +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]*> + )/x ); +} + sub newline_to_br { my ($message)=@_; my $newmessage;