--- loncom/interface/lonmsg.pm 2004/11/17 21:31:37 1.121
+++ loncom/interface/lonmsg.pm 2004/12/11 16:31:59 1.123
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines for messaging
#
-# $Id: lonmsg.pm,v 1.121 2004/11/17 21:31:37 www Exp $
+# $Id: lonmsg.pm,v 1.123 2004/12/11 16:31:59 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -697,7 +697,6 @@ sub discrit {
foreach (sort keys %what) {
my %content=&unpackagemsg($what{$_});
next if ($content{'senderdomain'} eq '');
- $content{'message'}=~s/\n/\
/g;
$result.='
'.&mt('From').': '.
&Apache::loncommon::aboutmewrapper(
&Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),$content{'sendername'},$content{'senderdomain'}).' ('.
@@ -1912,7 +1911,13 @@ sub sendoffmail {
foreach (keys %toaddr) {
my ($recuname,$recdomain)=split(/\:/,$_);
- my $msgtxt=&Apache::lonfeedback::clear_out_html($ENV{'form.message'});
+ my $msgtxt;
+ if ((($ENV{'form.critmsg'}) || ($ENV{'form.sendbck'})) &&
+ (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}))) {
+ $msgtxt=&Apache::lonfeedback::clear_out_html($ENV{'form.message'},1);
+ } else {
+ $msgtxt=&Apache::lonfeedback::clear_out_html($ENV{'form.message'});
+ }
if ($toaddr{$_}) { $msgtxt.='
'.$toaddr{$_}; }
my $thismsg;
if ((($ENV{'form.critmsg'}) || ($ENV{'form.sendbck'})) &&