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.120 and 1.123

version 1.120, 2004/11/17 21:05:26	version 1.123, 2004/12/11 16:31:59
Line 697 sub discrit {	Line 697 sub discrit {
foreach (sort keys %what) {	foreach (sort keys %what) {
my %content=&unpackagemsg($what{$_});	my %content=&unpackagemsg($what{$_});
next if ($content{'senderdomain'} eq '');	next if ($content{'senderdomain'} eq '');
$content{'message'}=~s/\n/\<br\>/g;
$result.='<hr />'.&mt('From').': <b>'.	$result.='<hr />'.&mt('From').': <b>'.
&Apache::loncommon::aboutmewrapper(	&Apache::loncommon::aboutmewrapper(
&Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),$content{'sendername'},$content{'senderdomain'}).'</b> ('.	&Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),$content{'sendername'},$content{'senderdomain'}).'</b> ('.
Line 1006 ENDDISHEADER	Line 1005 ENDDISHEADER

sub compout {	sub compout {
my ($r,$forwarding,$replying,$broadcast,$replycrit,$folder)=@_;	my ($r,$forwarding,$replying,$broadcast,$replycrit,$folder)=@_;
	my $suffix=&foldersuffix($folder);

if ($broadcast eq 'individual') {	if ($broadcast eq 'individual') {
&printheader($r,'/adm/email?compose=individual',	&printheader($r,'/adm/email?compose=individual',
Line 1057 sub compout {	Line 1057 sub compout {
my %content;	my %content;
my $defdom=$ENV{'user.domain'};	my $defdom=$ENV{'user.domain'};
if ($forwarding) {	if ($forwarding) {
%message=&Apache::lonnet::get('nohist_email',[$forwarding]);	%message=&Apache::lonnet::get('nohist_email'.$suffix,[$forwarding]);
%content=&unpackagemsg($message{$forwarding},$folder);	%content=&unpackagemsg($message{$forwarding},$folder);
$dispcrit.='<input type="hidden" name="forwid" value="'.	$dispcrit.='<input type="hidden" name="forwid" value="'.
$forwarding.'" />';	$forwarding.'" />';
Line 1071 sub compout {	Line 1071 sub compout {
}	}
}	}
if ($replying) {	if ($replying) {
%message=&Apache::lonnet::get('nohist_email',[$replying]);	%message=&Apache::lonnet::get('nohist_email'.$suffix,[$replying]);
%content=&unpackagemsg($message{$replying},$folder);	%content=&unpackagemsg($message{$replying},$folder);
$dispcrit.='<input type="hidden" name="replyid" value="'.	$dispcrit.='<input type="hidden" name="replyid" value="'.
$replying.'" />';	$replying.'" />';
Line 1911 sub sendoffmail {	Line 1911 sub sendoffmail {

foreach (keys %toaddr) {	foreach (keys %toaddr) {
my ($recuname,$recdomain)=split(/\:/,$_);	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.='<hr />'.$toaddr{$_}; }	if ($toaddr{$_}) { $msgtxt.='<hr />'.$toaddr{$_}; }
my $thismsg;	my $thismsg;
if ((($ENV{'form.critmsg'}) \|\| ($ENV{'form.sendbck'})) &&	if ((($ENV{'form.critmsg'}) \|\| ($ENV{'form.sendbck'})) &&
Line 2046 sub handler {	Line 2052 sub handler {
&printheader($r,'','Displaying Critical Messages');	&printheader($r,'','Displaying Critical Messages');
&discrit($r);	&discrit($r);
} elsif ($ENV{'form.forward'}) {	} elsif ($ENV{'form.forward'}) {
&compout($r,$ENV{'form.forward'},undef,undef,$folder);	&compout($r,$ENV{'form.forward'},undef,undef,undef,$folder);
} elsif ($ENV{'form.markdel'}) {	} elsif ($ENV{'form.markdel'}) {
&printheader($r,'','Deleted Message');	&printheader($r,'','Deleted Message');
&statuschange($ENV{'form.markdel'},'deleted',$folder);	&statuschange($ENV{'form.markdel'},'deleted',$folder);

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

Removed from v.1.120
changed lines
	Added in v.1.123