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.76 and 1.82

version 1.76, 2003/12/30 22:45:59	version 1.82, 2004/01/31 01:21:35
Line 294 sub retrieve_author_res_msg {	Line 294 sub retrieve_author_res_msg {
sub del_url_author_res_msg {	sub del_url_author_res_msg {
my $url=shift;	my $url=shift;
$url=&Apache::lonnet::declutter($url);	$url=&Apache::lonnet::declutter($url);
	my ($domain,$author)=($url=~/^(\w+)\/(\w+)\//);
	my @delmsgs=();
	foreach (&Apache::lonnet::getkeys('nohist_res_msgs',$domain,$author)) {
	if ($_=~/^\Q$url\E\_\d+$/) {
	push (@delmsgs,$_);
	}
	}
	return &Apache::lonnet::del('nohist_res_msgs',\@delmsgs,$domain,$author);
}	}

# ================= Return hash with URLs for which there is a resource message	# ================= Return hash with URLs for which there is a resource message
Line 388 sub user_crit_received {	Line 396 sub user_crit_received {
my %contents=&unpackagemsg($message{$msgid},1);	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'},
&mt('Receipt').': '.$ENV{'user.name'}.' at '.$ENV{'user.domain'},	&mt('Receipt').': '.$ENV{'user.name'}.' '.&mt('at').' '.$ENV{'user.domain'}.', '.$contents{'subject'},
&mt('User').' '.$ENV{'user.name'}.' '.&mt('at').' '.$ENV{'user.domain'}.	&mt('User').' '.$ENV{'user.name'}.' '.&mt('at').' '.$ENV{'user.domain'}.
' acknowledged receipt of message'."\n".' "'.	' acknowledged receipt of message'."\n".' "'.
$contents{'subject'}.'"'."\n".&mt('dated').' '.	$contents{'subject'}.'"'."\n".&mt('dated').' '.
Line 1016 sub handler {	Line 1024 sub handler {
if (!$ENV{'form.display'}) {	if (!$ENV{'form.display'}) {
$r->print('<html><head><title>EMail and Messaging</title>'.	$r->print('<html><head><title>EMail and Messaging</title>'.
&Apache::loncommon::studentbrowser_javascript().'</head>'.	&Apache::loncommon::studentbrowser_javascript().'</head>'.
&Apache::loncommon::bodytag('EMail and Messages'));	&Apache::loncommon::bodytag('EMail and Messages').
	&Apache::loncommon::help_open_faq(12).
	&Apache::loncommon::help_open_bug('Communication Tools'));
}	}
if ($ENV{'form.display'}) {	if ($ENV{'form.display'}) {
my $msgid=$ENV{'form.display'};	my $msgid=$ENV{'form.display'};
Line 1043 sub handler {	Line 1053 sub handler {
}	}
$r->print(&Apache::loncommon::studentbrowser_javascript().	$r->print(&Apache::loncommon::studentbrowser_javascript().
'</head>'.	'</head>'.
&Apache::loncommon::bodytag('EMail and Messages'));	&Apache::loncommon::bodytag('EMail and Messages').
	&Apache::loncommon::help_open_faq(12).
	&Apache::loncommon::help_open_bug('Communication Tools'));
$r->print('<b>'.&mt('Subject').':</b> '.$content{'subject'}.	$r->print('<b>'.&mt('Subject').':</b> '.$content{'subject'}.
'<br><b>'.&mt('From').':</b> '.	'<br><b>'.&mt('From').':</b> '.
&Apache::loncommon::aboutmewrapper(	&Apache::loncommon::aboutmewrapper(
Line 1072 $content{'sendername'},$content{'senderd	Line 1084 $content{'sendername'},$content{'senderd
'"><b>'.&mt('Next').'</b></a></td>');	'"><b>'.&mt('Next').'</b></a></td>');
}	}
$r->print('</tr></table><p><pre>'.	$r->print('</tr></table><p><pre>'.
&Apache::lontexconvert::msgtexconverted($content{'message'}).	&Apache::lontexconvert::msgtexconverted($content{'message'},1).
'</pre><hr>'.$content{'citation'});	'</pre><hr>'.$content{'citation'});
} elsif ($ENV{'form.replyto'}) {	} elsif ($ENV{'form.replyto'}) {
&comprep($r,$ENV{'form.replyto'});	&comprep($r,$ENV{'form.replyto'});

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

Removed from v.1.76
changed lines
	Added in v.1.82