version 1.55, 2003/06/20 14:55:01
|
version 1.57, 2003/07/05 10:07:11
|
Line 486 sub comprep {
|
Line 486 sub comprep {
|
$quotemsg=~s/\r/\n/g; |
$quotemsg=~s/\r/\n/g; |
$quotemsg=~s/\f/\n/g; |
$quotemsg=~s/\f/\n/g; |
$quotemsg=~s/\n+/\n\> /g; |
$quotemsg=~s/\n+/\n\> /g; |
|
my $torepl=&Apache::loncommon::aboutmewrapper( |
|
&Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),$content{'sendername'},$content{'senderdomain'}).' ('. |
|
$content{'sendername'}.'@'. |
|
$content{'senderdomain'}.')'; |
my $subject='Re: '.$content{'subject'}; |
my $subject='Re: '.$content{'subject'}; |
my $dispcrit=''; |
my $dispcrit=''; |
if (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) { |
if (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) { |
Line 499 sub comprep {
|
Line 503 sub comprep {
|
$r->print(<<"ENDREPLY"); |
$r->print(<<"ENDREPLY"); |
<form action="/adm/email" method=post> |
<form action="/adm/email" method=post> |
<input type=hidden name=sendreply value="$msgid"> |
<input type=hidden name=sendreply value="$msgid"> |
|
To: $torepl<br /> |
Subject: <input type=text size=50 name=subject value="$subject"><p> |
Subject: <input type=text size=50 name=subject value="$subject"><p> |
<textarea name=message cols=84 rows=10 wrap=hard> |
<textarea name=message cols=84 rows=10 wrap=hard> |
$quotemsg |
$quotemsg |
Line 839 $content{'sendername'},$content{'senderd
|
Line 844 $content{'sendername'},$content{'senderd
|
$r->print('Sending critical: '. |
$r->print('Sending critical: '. |
&user_crit_msg($content{'sendername'}, |
&user_crit_msg($content{'sendername'}, |
$content{'senderdomain'}, |
$content{'senderdomain'}, |
$ENV{'form.subject'}, |
&Apache::lonfeedback::clear_out_html($ENV{'form.subject'}), |
$ENV{'form.message'}, |
&Apache::lonfeedback::clear_out_html($ENV{'form.message'}), |
$ENV{'form.sendbck'})); |
$ENV{'form.sendbck'})); |
} else { |
} else { |
$r->print('Sending: '.&user_normal_msg($content{'sendername'}, |
$r->print('Sending: '.&user_normal_msg($content{'sendername'}, |
$content{'senderdomain'}, |
$content{'senderdomain'}, |
$ENV{'form.subject'}, |
&Apache::lonfeedback::clear_out_html($ENV{'form.subject'}), |
$ENV{'form.message'})); |
&Apache::lonfeedback::clear_out_html($ENV{'form.message'}))); |
} |
} |
if ($ENV{'form.displayedcrit'}) { |
if ($ENV{'form.displayedcrit'}) { |
&discrit($r); |
&discrit($r); |
Line 930 $content{'sendername'},$content{'senderd
|
Line 935 $content{'sendername'},$content{'senderd
|
} |
} |
foreach (keys %toaddr) { |
foreach (keys %toaddr) { |
my ($recuname,$recdomain)=split(/\:/,$_); |
my ($recuname,$recdomain)=split(/\:/,$_); |
my $msgtxt=$ENV{'form.message'}; |
my $msgtxt=&Apache::lonfeedback::clear_out_html($ENV{'form.message'}); |
if ($toaddr{$_}) { $msgtxt.='<hr>'.$toaddr{$_}; } |
if ($toaddr{$_}) { $msgtxt.='<hr>'.$toaddr{$_}; } |
if ((($ENV{'form.critmsg'}) || ($ENV{'form.sendbck'})) && |
if ((($ENV{'form.critmsg'}) || ($ENV{'form.sendbck'})) && |
(&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}))) { |
(&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}))) { |
$r->print('Sending critical: '. |
$r->print('Sending critical: '. |
&user_crit_msg($recuname,$recdomain, |
&user_crit_msg($recuname,$recdomain, |
$ENV{'form.subject'}, |
&Apache::lonfeedback::clear_out_html($ENV{'form.subject'}), |
$msgtxt, |
$msgtxt, |
$ENV{'form.sendbck'})); |
$ENV{'form.sendbck'})); |
} else { |
} else { |
$r->print('Sending: '.&user_normal_msg($recuname,$recdomain, |
$r->print('Sending: '.&user_normal_msg($recuname,$recdomain, |
$ENV{'form.subject'}, |
&Apache::lonfeedback::clear_out_html($ENV{'form.subject'}), |
$msgtxt, |
$msgtxt, |
$content{'citation'})); |
$content{'citation'})); |
} |
} |