--- loncom/interface/lonfeedback.pm 2010/01/24 02:39:35 1.273.4.2
+++ loncom/interface/lonfeedback.pm 2010/01/24 23:20:16 1.273.4.4
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Feedback
#
-# $Id: lonfeedback.pm,v 1.273.4.2 2010/01/24 02:39:35 raeburn Exp $
+# $Id: lonfeedback.pm,v 1.273.4.4 2010/01/24 23:20:16 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1482,7 +1482,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',
@@ -1693,7 +1692,6 @@ END
END
}
$r->print(<
$lt{'myqu'}
@@ -2639,12 +2637,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; @@ -2942,6 +2940,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*> + )}xs + ); +} sub newline_to_br { my ($message)=@_;