version 1.202, 2007/05/02 19:56:34
|
version 1.205, 2007/05/08 16:50:02
|
Line 163 sub packagemsg {
|
Line 163 sub packagemsg {
|
if (defined($recipid)) { |
if (defined($recipid)) { |
$result.= '<recipid>'.$recipid.'</recipid>'; |
$result.= '<recipid>'.$recipid.'</recipid>'; |
} |
} |
|
if ($env{'form.can_reply'} eq 'N') { |
|
$result .= '<noreplies>1</noreplies>'; |
|
} |
|
if ($env{'form.reply_to_addr'}) { |
|
my ($replytoname,$replytodom) = split(/:/,$env{'form.reply_to_addr'}); |
|
if (!($replytoname eq $env{'user.name'} && $replytodom eq $env{'user.domain'})) { |
|
if (&Apache::lonnet::homeserver($replytoname,$replytodom) ne 'no_host') { |
|
$result .= '<replytoaddr>'.$env{'form.reply_to_addr'}.'</replytoaddr>'; |
|
} |
|
} |
|
} |
return ($msgid,$result); |
return ($msgid,$result); |
} |
} |
|
|
Line 551 sub user_crit_received {
|
Line 562 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},1); |
my %contents=&unpackagemsg($message{$msgid},1); |
|
my $destname = $contents{'sendername'}; |
|
my $destdom = $contents{'senderdomain'}; |
|
if ($contents{'replytoaddr'}) { |
|
my ($repname,$repdom) = split(/:/,$contents{'replytoaddr'}); |
|
if (&Apache::lonnet::homeserver($repname,$repdom) ne 'no_host') { |
|
$destname = $repname; |
|
$destdom = $repdom; |
|
} |
|
} |
my $status='rec: '.($contents{'sendback'}? |
my $status='rec: '.($contents{'sendback'}? |
&user_normal_msg($contents{'sendername'},$contents{'senderdomain'}, |
&user_normal_msg($destname,$destdom,&mt('Receipt').': '.$env{'user.name'}. |
&mt('Receipt').': '.$env{'user.name'}.' '.&mt('at').' '.$env{'user.domain'}.', '.$contents{'subject'}, |
' '.&mt('at').' '.$env{'user.domain'}.', '. |
&mt('User').' '.$env{'user.name'}.' '.&mt('at').' '.$env{'user.domain'}. |
$contents{'subject'},&mt('User').' '.$env{'user.name'}. |
' acknowledged receipt of message'."\n".' "'. |
' '.&mt('at').' '.$env{'user.domain'}. |
$contents{'subject'}.'"'."\n".&mt('dated').' '. |
' acknowledged receipt of message'."\n".' "'. |
$contents{'time'}.".\n" |
$contents{'subject'}.'"'."\n".&mt('dated').' '. |
):'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 685 sub process_sent_mail {
|
Line 706 sub process_sent_mail {
|
my $sentsubj; |
my $sentsubj; |
if ($numsent > 1) { |
if ($numsent > 1) { |
$sentsubj = $subj_prefix.' ('.$numsent.' sent) '.$msgsubj; |
$sentsubj = $subj_prefix.' ('.$numsent.' sent) '.$msgsubj; |
|
} else { |
|
if ($subj_prefix) { |
|
$sentsubj = $subj_prefix.' '; |
|
} |
|
$sentsubj .= $msgsubj; |
} |
} |
$sentsubj = &HTML::Entities::encode($sentsubj,'<>&"'); |
$sentsubj = &HTML::Entities::encode($sentsubj,'<>&"'); |
my $sentmsgid = |
my $sentmsgid = |
Line 717 sub store_sent_mail {
|
Line 743 sub store_sent_mail {
|
sub store_recipients { |
sub store_recipients { |
my ($subject,$sendername,$senderdom,$reciphash) = @_; |
my ($subject,$sendername,$senderdom,$reciphash) = @_; |
my $context = &get_course_context(); |
my $context = &get_course_context(); |
my $now = time; |
my $now = time(); |
my $msgcount = &get_uniq(); |
my $msgcount = &get_uniq(); |
my $recipid = |
my $recipid = |
&buildmsgid($now,$subject,$sendername,$senderdom,$msgcount,$context,$$); |
&buildmsgid($now,$subject,$sendername,$senderdom,$msgcount,$context,$$); |