loncom/interface/lonmsg.pm - diff

Return to lonmsg.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonmsg.pm between versions 1.39 and 1.57

version 1.39, 2002/09/16 20:06:12	version 1.57, 2003/07/05 10:07:11
Line 47 package Apache::lonmsg;	Line 47 package Apache::lonmsg;
use strict;	use strict;
use Apache::lonnet();	use Apache::lonnet();
use vars qw($msgcount);	use vars qw($msgcount);
use HTML::TokeParser;	use HTML::TokeParser();
use Apache::Constants qw(:common);	use Apache::Constants qw(:common);
use Apache::loncommon;	use Apache::loncommon();
use Apache::lontexconvert;	use Apache::lontexconvert();
	use HTML::Entities();
	use Mail::Send;

# ===================================================================== Package	# ===================================================================== Package

sub packagemsg {	sub packagemsg {
my ($subject,$message,$citation)=@_;	my ($subject,$message,$citation,$baseurl,$attachmenturl)=@_;
$message=~s/\</\&lt\;/g;	$message =&HTML::Entities::encode($message);
$message=~s/\>/\&gt\;/g;	$citation=&HTML::Entities::encode($citation);
$citation=~s/\</\&lt\;/g;	$subject =&HTML::Entities::encode($subject);
$citation=~s/\>/\&gt\;/g;	#remove machine specification
$subject=~s/\</\&lt\;/g;	$baseurl =~ s\|^http://[^/]+/\|/\|;
$subject=~s/\>/\&gt\;/g;	$baseurl =&HTML::Entities::encode($baseurl);
	#remove machine specification
	$attachmenturl =~ s\|^http://[^/]+/\|/\|;
	$attachmenturl =&HTML::Entities::encode($attachmenturl);

my $now=time;	my $now=time;
$msgcount++;	$msgcount++;
my $partsubj=$subject;	my $partsubj=$subject;
Line 69 sub packagemsg {	Line 75 sub packagemsg {
my $msgid=&Apache::lonnet::escape(	my $msgid=&Apache::lonnet::escape(
$now.':'.$partsubj.':'.$ENV{'user.name'}.':'.	$now.':'.$partsubj.':'.$ENV{'user.name'}.':'.
$ENV{'user.domain'}.':'.$msgcount.':'.$$);	$ENV{'user.domain'}.':'.$msgcount.':'.$$);
return $msgid,	my $result='<sendername>'.$ENV{'user.name'}.'</sendername>'.
'<sendername>'.$ENV{'user.name'}.'</sendername>'.
'<senderdomain>'.$ENV{'user.domain'}.'</senderdomain>'.	'<senderdomain>'.$ENV{'user.domain'}.'</senderdomain>'.
'<subject>'.$subject.'</subject>'.	'<subject>'.$subject.'</subject>'.
'<time>'.localtime($now).'</time>'.	'<time>'.localtime($now).'</time>'.
Line 86 sub packagemsg {	Line 91 sub packagemsg {
'<role>'.$ENV{'request.role'}.'</role>'.	'<role>'.$ENV{'request.role'}.'</role>'.
'<resource>'.$ENV{'request.filename'}.'</resource>'.	'<resource>'.$ENV{'request.filename'}.'</resource>'.
'<msgid>'.$msgid.'</msgid>'.	'<msgid>'.$msgid.'</msgid>'.
'<message>'.$message.'</message>'.	'<message>'.$message.'</message>';
'<citation>'.$citation.'</citation>';	if (defined($citation)) {
	$result.='<citation>'.$citation.'</citation>';
	}
	if (defined($baseurl)) {
	$result.= '<baseurl>'.$baseurl.'</baseurl>';
	}
	if (defined($attachmenturl)) {
	$result.= '<attachmenturl>'.$attachmenturl.'</attachmenturl>';
	}
	return $msgid,$result;
}	}

# ================================================== Unpack message into a hash	# ================================================== Unpack message into a hash

sub unpackagemsg {	sub unpackagemsg {
my $message=shift;	my ($message,$notoken)=@_;
my %content=();	my %content=();
my $parser=HTML::TokeParser->new(\$message);	my $parser=HTML::TokeParser->new(\$message);
my $token;	my $token;
Line 104 sub unpackagemsg {	Line 118 sub unpackagemsg {
$content{$entry}=$value;	$content{$entry}=$value;
}	}
}	}
	if ($content{'attachmenturl'}) {
	my ($fname,$ft)=($content{'attachmenturl'}=~/\/(\w+)\.(\w+)$/);
	if ($notoken) {
	$content{'message'}.='<p>Attachment: <tt>'.$fname.'.'.$ft.'</tt>';
	} else {
	$content{'message'}.='<p>Attachment: <a href="'.
	&Apache::lonnet::tokenwrapper($content{'attachmenturl'}).
	'"><tt>'.$fname.'.'.$ft.'</tt></a>';
	}
	}
return %content;	return %content;
}	}

Line 119 sub unpackmsgid {	Line 143 sub unpackmsgid {
return ($sendtime,$shortsubj,$fromname,$fromdomain,$status{$msgid});	return ($sendtime,$shortsubj,$fromname,$fromdomain,$status{$msgid});
}	}


	sub sendemail {
	my ($to,$subject,$body)=@_;
	$body=
	"*** This is an automatic message generated by the LON-CAPA system.\n".
	"*** Please do not reply to this address.\n\n".$body;
	my $msg = new Mail::Send;
	$msg->to($to);
	$msg->subject('[LON-CAPA] '.$subject);
	my $fh = $msg->open('smtp',Server => 'localhost');
	print $fh $body;
	$fh->close;
	}

	# ==================================================== Send notification emails

	sub sendnotification {
	my ($to,$touname,$toudom,$subj,$crit)=@_;
	my $sender=$ENV{'environment.firstname'}.' '.$ENV{'environment.lastname'};
	my $critical=($crit?' critical':'');
	my $url='http://'.
	$Apache::lonnet::hostname{&Apache::lonnet::homeserver($touname,$toudom)}.
	'/adm/email?username='.$touname.'&domain='.$toudom;
	my $body=(<<ENDMSG);
	You received a$critical message from $sender in LON-CAPA. The subject is

	$subj

	Use

	$url

	to access this message.
	ENDMSG
	&sendemail($to,'New'.$critical.' message from '.$sender,$body);
	}
	# ============================================================= Check for email

	sub newmail {
	if ((time-$ENV{'user.mailcheck.time'})>300) {
	my %what=&Apache::lonnet::get('email_status',['recnewemail']);
	&Apache::lonnet::appenv('user.mailcheck.time'=>time);
	if ($what{'recnewemail'}>0) { return 1; }
	}
	return 0;
	}

# =============================== Automated message to the author of a resource	# =============================== Automated message to the author of a resource

sub author_res_msg {	sub author_res_msg {
Line 155 sub user_crit_msg_raw {	Line 226 sub user_crit_msg_raw {
'put:'.$domain.':'.$user.':critical:'.	'put:'.$domain.':'.$user.':critical:'.
&Apache::lonnet::escape($msgid).'='.	&Apache::lonnet::escape($msgid).'='.
&Apache::lonnet::escape($message),$homeserver);	&Apache::lonnet::escape($message),$homeserver);
	if ($ENV{'request.course.id'}) {
	&user_normal_msg_raw(
	$ENV{'course.'.$ENV{'request.course.id'}.'.num'},
	$ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
	'Critical ['.$user.':'.$domain.']',
	$message);
	}
} else {	} else {
$status='no_host';	$status='no_host';
}	}
	# Notifications
	my %userenv = &Apache::lonnet::get('environment',['critnotification'],
	$domain,$user);
	if ($userenv{'critnotification'}) {
	&sendnotification($userenv{'critnotification'},$user,$domain,$subject,1);
	}
	# Log this
&Apache::lonnet::logthis(	&Apache::lonnet::logthis(
'Sending critical email '.$msgid.	'Sending critical email '.$msgid.
', log status: '.	', log status: '.
Line 194 sub user_crit_msg {	Line 279 sub user_crit_msg {
sub user_crit_received {	sub user_crit_received {
my $msgid=shift;	my $msgid=shift;
my %message=&Apache::lonnet::get('critical',[$msgid]);	my %message=&Apache::lonnet::get('critical',[$msgid]);
my %contents=&unpackagemsg($message{$msgid});	my %contents=&unpackagemsg($message{$msgid},1);
my $status='rec: '.($contents{'sendback'}?	my $status='rec: '.($contents{'sendback'}?
&user_normal_msg($contents{'sendername'},$contents{'senderdomain'},	&user_normal_msg($contents{'sendername'},$contents{'senderdomain'},
'Receipt: '.$ENV{'user.name'}.' at '.$ENV{'user.domain'},	'Receipt: '.$ENV{'user.name'}.' at '.$ENV{'user.domain'},
'User '.$ENV{'user.name'}.' at '.$ENV{'user.domain'}.	'User '.$ENV{'user.name'}.' at '.$ENV{'user.domain'}.
' acknowledged receipt of message "'.	' acknowledged receipt of message'."\n".' "'.
$contents{'subject'}.'" dated '.$contents{'time'}.".\n\n"	$contents{'subject'}.'"'."\n".'dated '.
.'Message ID: '.$contents{'msgid'}):'no msg req');	$contents{'time'}.".\n"
	):'no msg req');
$status.=' trans: '.	$status.=' trans: '.
&Apache::lonnet::put(	&Apache::lonnet::put(
'nohist_email',{$contents{'msgid'} => $message{$msgid}});	'nohist_email',{$contents{'msgid'} => $message{$msgid}});
Line 217 sub user_crit_received {	Line 303 sub user_crit_received {
# ======================================================== Normal communication	# ======================================================== Normal communication

sub user_normal_msg_raw {	sub user_normal_msg_raw {
my ($user,$domain,$subject,$message,$citation)=@_;	my ($user,$domain,$subject,$message,$citation,$baseurl,$attachmenturl)=@_;
# Check if allowed missing	# Check if allowed missing
my $status='';	my $status='';
my $msgid='undefined';	my $msgid='undefined';
unless (($message)&&($user)&&($domain)) { $status='empty'; };	unless (($message)&&($user)&&($domain)) { $status='empty'; };
my $homeserver=&Apache::lonnet::homeserver($user,$domain);	my $homeserver=&Apache::lonnet::homeserver($user,$domain);
if ($homeserver ne 'no_host') {	if ($homeserver ne 'no_host') {
($msgid,$message)=&packagemsg($subject,$message,$citation);	($msgid,$message)=&packagemsg($subject,$message,$citation,$baseurl,
	$attachmenturl);
$status=&Apache::lonnet::critical(	$status=&Apache::lonnet::critical(
'put:'.$domain.':'.$user.':nohist_email:'.	'put:'.$domain.':'.$user.':nohist_email:'.
&Apache::lonnet::escape($msgid).'='.	&Apache::lonnet::escape($msgid).'='.
&Apache::lonnet::escape($message),$homeserver);	&Apache::lonnet::escape($message),$homeserver);
	&Apache::lonnet::put
	('email_status',{'recnewemail'=>time},$domain,$user);
} else {	} else {
$status='no_host';	$status='no_host';
}	}
	# Notifications
	my %userenv = &Apache::lonnet::get('environment',['notification'],
	$domain,$user);
	if ($userenv{'notification'}) {
	&sendnotification($userenv{'notification'},$user,$domain,$subject,0);
	}
&Apache::lonnet::log($ENV{'user.domain'},$ENV{'user.name'},	&Apache::lonnet::log($ENV{'user.domain'},$ENV{'user.name'},
$ENV{'user.home'},	$ENV{'user.home'},
'Sending '.$msgid.' to '.$user.' at '.$domain.' with status: '.$status);	'Sending '.$msgid.' to '.$user.' at '.$domain.' with status: '.$status);
Line 241 sub user_normal_msg_raw {	Line 336 sub user_normal_msg_raw {
# New routine that respects "forward" and calls old routine	# New routine that respects "forward" and calls old routine

sub user_normal_msg {	sub user_normal_msg {
my ($user,$domain,$subject,$message,$citation)=@_;	my ($user,$domain,$subject,$message,$citation,$baseurl,$attachmenturl)=@_;
my $status='';	my $status='';
my %userenv = &Apache::lonnet::get('environment',['msgforward'],	my %userenv = &Apache::lonnet::get('environment',['msgforward'],
$domain,$user);	$domain,$user);
Line 251 sub user_normal_msg {	Line 346 sub user_normal_msg {
my ($forwuser,$forwdomain)=split(/\:/,$_);	my ($forwuser,$forwdomain)=split(/\:/,$_);
$status.=	$status.=
&user_normal_msg_raw($forwuser,$forwdomain,$subject,$message,	&user_normal_msg_raw($forwuser,$forwdomain,$subject,$message,
$citation).' ';	$citation,$baseurl,$attachmenturl).' ';
}	}
} else {	} else {
$status=	$status=&user_normal_msg_raw($user,$domain,$subject,$message,
&user_normal_msg_raw($user,$domain,$subject,$message,$citation);	$citation,$baseurl,$attachmenturl);
}	}
return $status;	return $status;
}	}
Line 386 $content{'sendername'}.'@'.	Line 481 $content{'sendername'}.'@'.
sub comprep {	sub comprep {
my ($r,$msgid)=@_;	my ($r,$msgid)=@_;
my %message=&Apache::lonnet::get('nohist_email',[$msgid]);	my %message=&Apache::lonnet::get('nohist_email',[$msgid]);
my %content=&unpackagemsg($message{$msgid});	my %content=&unpackagemsg($message{$msgid},1);
my $quotemsg='> '.$content{'message'};	my $quotemsg='> '.$content{'message'};
$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 404 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 512 sub compout {	Line 612 sub compout {
'<table>');	'<table>');
unless (($broadcast eq 'group') \|\| ($broadcast eq 'upload')) {	unless (($broadcast eq 'group') \|\| ($broadcast eq 'upload')) {
my $domform = &Apache::loncommon::select_dom_form($defdom,'recdomain');	my $domform = &Apache::loncommon::select_dom_form($defdom,'recdomain');
	my $selectlink=&Apache::loncommon::selectstudent_link
	('compemail','recuname','recdomain');
$r->print(<<"ENDREC");	$r->print(<<"ENDREC");
<table>	<table>
<tr><td>Username:</td><td><input type=text size=12 name=recuname value="$ENV{'form.recname'}"></td></tr>	<tr><td>Username:</td><td><input type=text size=12 name=recuname value="$ENV{'form.recname'}"></td><td rowspan="2">$selectlink</td></tr>
<tr><td>Domain:</td>	<tr><td>Domain:</td>
<td>$domform</td></tr>	<td>$domform</td></tr>
ENDREC	ENDREC
}	}
	my $latexHelp = Apache::loncommon::helpLatexCheatsheet();
if ($broadcast ne 'upload') {	if ($broadcast ne 'upload') {
$r->print(<<"ENDCOMP");	$r->print(<<"ENDCOMP");
<tr><td>Additional Recipients<br><tt>username\@domain,username\@domain, ...	<tr><td>Additional Recipients<br><tt>username\@domain,username\@domain, ...
Line 527 ENDREC	Line 629 ENDREC
<input type=text size=50 name=additionalrec></td></tr>	<input type=text size=50 name=additionalrec></td></tr>
<tr><td>Subject:</td><td><input type=text size=50 name=subject value="$dissub">	<tr><td>Subject:</td><td><input type=text size=50 name=subject value="$dissub">
</td></tr></table>	</td></tr></table>
	$latexHelp
<textarea name=message cols=80 rows=10 wrap=hard>$dismsg	<textarea name=message cols=80 rows=10 wrap=hard>$dismsg
</textarea><p>	</textarea><p>
$dispcrit	$dispcrit
Line 565 ENDUPLOAD	Line 668 ENDUPLOAD
$r->print('</form>');	$r->print('</form>');
}	}

	# ---------------------------------------------------- Display all face to face

	sub disfacetoface {
	my ($r,$user,$domain)=@_;
	unless ($ENV{'request.course.id'}) { return; }
	unless (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) {
	return;
	}
	my %records=&Apache::lonnet::dump('nohist_email',
	$ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
	$ENV{'course.'.$ENV{'request.course.id'}.'.num'},
	'%255b'.$user.'%253a'.$domain.'%255d');
	my $result='';
	foreach (sort keys %records) {
	my %content=&unpackagemsg($records{$_});
	next if ($content{'senderdomain'} eq '');
	$content{'message'}=~s/\n/\<br\>/g;
	if ($content{'subject'}=~/^Record/) {
	$result.='<h3>Record</h3>';
	} else {
	$result.='<h3>Sent Message</h3>';
	%content=&unpackagemsg($content{'message'});
	$content{'message'}=
	'<b>Subject: '.$content{'subject'}.'</b><br />'.
	$content{'message'};
	}
	$result.='By: <b>'.
	&Apache::loncommon::aboutmewrapper(
	&Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),$content{'sendername'},$content{'senderdomain'}).'</b> ('.
	$content{'sendername'}.'@'.
	$content{'senderdomain'}.') '.$content{'time'}.
	'<br><blockquote>'.
	&Apache::lontexconvert::msgtexconverted($content{'message'}).
	'</blockquote>';
	}
	# Check to see if there were any messages.
	if ($result eq '') {
	$r->print("<p><b>No notes, face-to-face discussion records, or critical messages in this course.</b></p>");
	} else {
	$r->print($result);
	}
	}

	# ---------------------------------------------------------------- Face to face

	sub facetoface {
	my ($r,$stage)=@_;
	unless (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) {
	return;
	}
	# from query string
	if ($ENV{'form.recname'}) { $ENV{'form.recuname'}=$ENV{'form.recname'}; }
	if ($ENV{'form.recdom'}) { $ENV{'form.recdomain'}=$ENV{'form.recdom'}; }

	my $defdom=$ENV{'user.domain'};
	# already filled in
	if ($ENV{'form.recdomain'}) { $defdom=$ENV{'form.recdomain'}; }
	# generate output
	my $domform = &Apache::loncommon::select_dom_form($defdom,'recdomain');
	my $stdbrws = &Apache::loncommon::selectstudent_link
	('stdselect','recuname','recdomain');
	$r->print(<<"ENDTREC");
	<h3>User Notes, Records of Face-To-Face Discussions, and Critical Messages in Course</h3>
	<form method="post" action="/adm/email" name="stdselect">
	<input type="hidden" name="recordftf" value="retrieve" />
	<table>
	<tr><td>Username:</td><td><input type=text size=12 name=recuname value="$ENV{'form.recuname'}"></td>
	<td rowspan="2">
	$stdbrws
	<input type="submit" value="Retrieve discussion and message records"></td>
	</tr>
	<tr><td>Domain:</td>
	<td>$domform</td></tr>
	</table>
	</form>
	ENDTREC
	if (($stage ne 'query') &&
	($ENV{'form.recdomain'}) && ($ENV{'form.recuname'})) {
	chomp($ENV{'form.newrecord'});
	if ($ENV{'form.newrecord'}) {
	&user_normal_msg_raw(
	$ENV{'course.'.$ENV{'request.course.id'}.'.num'},
	$ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
	'Record ['.$ENV{'form.recuname'}.':'.$ENV{'form.recdomain'}.']',
	$ENV{'form.newrecord'});
	}
	$r->print('<h3>'.&Apache::loncommon::plainname($ENV{'form.recuname'},
	$ENV{'form.recdomain'}).'</h3>');
	&disfacetoface($r,$ENV{'form.recuname'},$ENV{'form.recdomain'});
	$r->print(<<ENDRHEAD);
	<form method="post" action="/adm/email">
	<input name="recdomain" value="$ENV{'form.recdomain'}" type="hidden" />
	<input name="recuname" value="$ENV{'form.recuname'}" type="hidden" />
	ENDRHEAD
	$r->print(<<ENDBFORM);
	<hr />New Record (record is visible to course faculty and staff)<br />
	<textarea name="newrecord" cols="80" rows="10" wrap="hard"></textarea>
	<br />
	<input type="hidden" name="recordftf" value="post" />
	<input type="submit" value="Post this record" />
	</form>
	ENDBFORM
	}
	}

# ===================================================================== Handler	# ===================================================================== Handler

sub handler {	sub handler {
Line 580 sub handler {	Line 788 sub handler {
# --------------------------- Get query string for limited number of parameters	# --------------------------- Get query string for limited number of parameters
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},	&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
['display','replyto','forward','markread','markdel','markunread',	['display','replyto','forward','markread','markdel','markunread',
'sendreply','compose','sendmail','critical','recname','recdom']);	'sendreply','compose','sendmail','critical','recname','recdom',
	'recordftf']);

	# ------------------------------------------------------ They checked for email
	&Apache::lonnet::put('email_status',{'recnewemail'=>0});
# --------------------------------------------------------------- Render Output	# --------------------------------------------------------------- Render Output
	if (!$ENV{'form.display'}) {
$r->print('<html><head><title>EMail and Messaging</title></head>'.	$r->print('<html><head><title>EMail and Messaging</title>'.
&Apache::loncommon::bodytag('EMail and Messages'));	&Apache::loncommon::studentbrowser_javascript().'</head>'.
	&Apache::loncommon::bodytag('EMail and Messages'));
	}
if ($ENV{'form.display'}) {	if ($ENV{'form.display'}) {
my $msgid=$ENV{'form.display'};	my $msgid=$ENV{'form.display'};
&statuschange($msgid,'read');	&statuschange($msgid,'read');
my %message=&Apache::lonnet::get('nohist_email',[$msgid]);	my %message=&Apache::lonnet::get('nohist_email',[$msgid]);
my %content=&unpackagemsg($message{$msgid});	my %content=&unpackagemsg($message{$msgid});
	$r->print('<html><head><title>EMail and Messaging</title>');
	if (defined($content{'baseurl'})) {
	$r->print("<base href=\"http://$ENV{'SERVER_NAME'}/$content{'baseurl'}\" />");
	}
	$r->print(&Apache::loncommon::studentbrowser_javascript().
	'</head>'.
	&Apache::loncommon::bodytag('EMail and Messages'));
$r->print('<b>Subject:</b> '.$content{'subject'}.	$r->print('<b>Subject:</b> '.$content{'subject'}.
'<br><b>From:</b> '.	'<br><b>From:</b> '.
&Apache::loncommon::aboutmewrapper(	&Apache::loncommon::aboutmewrapper(
Line 606 $content{'sendername'},$content{'senderd	Line 826 $content{'sendername'},$content{'senderd
'"><b>Forward</b></a></td>'.	'"><b>Forward</b></a></td>'.
'<td><a href="/adm/email?markunread='.&Apache::lonnet::escape($msgid).	'<td><a href="/adm/email?markunread='.&Apache::lonnet::escape($msgid).
'"><b>Mark Unread</b></a></td>'.	'"><b>Mark Unread</b></a></td>'.
	'<td><a href="/adm/email?markdel='.&Apache::lonnet::escape($msgid).
	'"><b>Delete</b></a></td>'.
'<td><a href="/adm/email"><b>Display all Messages</b></a></td>'.	'<td><a href="/adm/email"><b>Display all Messages</b></a></td>'.
'</tr></table><p><pre>'.	'</tr></table><p><pre>'.
&Apache::lontexconvert::msgtexconverted($content{'message'}).	&Apache::lontexconvert::msgtexconverted($content{'message'}).
Line 615 $content{'sendername'},$content{'senderd	Line 837 $content{'sendername'},$content{'senderd
} elsif ($ENV{'form.sendreply'}) {	} elsif ($ENV{'form.sendreply'}) {
my $msgid=$ENV{'form.sendreply'};	my $msgid=$ENV{'form.sendreply'};
my %message=&Apache::lonnet::get('nohist_email',[$msgid]);	my %message=&Apache::lonnet::get('nohist_email',[$msgid]);
my %content=&unpackagemsg($message{$msgid});	my %content=&unpackagemsg($message{$msgid},1);
&statuschange($msgid,'replied');	&statuschange($msgid,'replied');
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($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 673 $content{'sendername'},$content{'senderd	Line 895 $content{'sendername'},$content{'senderd
&disall($r);	&disall($r);
} elsif ($ENV{'form.compose'}) {	} elsif ($ENV{'form.compose'}) {
&compout($r,'',$ENV{'form.compose'});	&compout($r,'',$ENV{'form.compose'});
	} elsif ($ENV{'form.recordftf'}) {
	&facetoface($r,$ENV{'form.recordftf'});
} elsif ($ENV{'form.sendmail'}) {	} elsif ($ENV{'form.sendmail'}) {
my %content=();	my %content=();
undef %content;	undef %content;
if ($ENV{'form.forwid'}) {	if ($ENV{'form.forwid'}) {
my $msgid=$ENV{'form.forwid'};	my $msgid=$ENV{'form.forwid'};
my %message=&Apache::lonnet::get('nohist_email',[$msgid]);	my %message=&Apache::lonnet::get('nohist_email',[$msgid]);
%content=&unpackagemsg($message{$msgid});	%content=&unpackagemsg($message{$msgid},1);
&statuschange($msgid,'forwarded');	&statuschange($msgid,'forwarded');
$ENV{'form.message'}.="\n\n-- Forwarded message --\n\n".	$ENV{'form.message'}.="\n\n-- Forwarded message --\n\n".
$content{'message'};	$content{'message'};
Line 711 $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'}));
}	}

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.39
changed lines
	Added in v.1.57