version 1.209, 2007/05/10 00:50:52
|
version 1.210, 2007/08/18 00:32:52
|
Line 511 sub user_crit_msg_raw {
|
Line 511 sub user_crit_msg_raw {
|
undef,undef,undef,undef,undef,undef,undef, |
undef,undef,undef,undef,undef,undef,undef, |
undef,$recipid); |
undef,$recipid); |
if ($sendback) { $packed_message.='<sendback>true</sendback>'; } |
if ($sendback) { $packed_message.='<sendback>true</sendback>'; } |
$status=&Apache::lonnet::critical( |
$status=&Apache::lonnet::cput('critical', {$msgid => $packed_message}, |
'put:'.$domain.':'.$user.':critical:'. |
$domain,$user); |
&escape($msgid).'='. |
|
&escape($packed_message),$homeserver); |
|
if (defined($sentmessage)) { |
if (defined($sentmessage)) { |
$$sentmessage = $packed_message; |
$$sentmessage = $packed_message; |
} |
} |
Line 651 sub user_normal_msg_raw {
|
Line 649 sub user_normal_msg_raw {
|
undef,$crsmsgid,$symb,$error,$recipid); |
undef,$crsmsgid,$symb,$error,$recipid); |
|
|
# Store in user folder |
# Store in user folder |
$status=&Apache::lonnet::critical( |
$status= |
'put:'.$domain.':'.$user.':nohist_email:'. |
&Apache::lonnet::cput('nohist_email',{$msgid => $packed_message}, |
&escape($msgid).'='. |
$domain,$user); |
&escape($packed_message),$homeserver); |
|
# Save new message received time |
# Save new message received time |
&Apache::lonnet::put |
&Apache::lonnet::put |
('email_status',{'recnewemail'=>time},$domain,$user); |
('email_status',{'recnewemail'=>time},$domain,$user); |
Line 740 sub user_normal_msg {
|
Line 737 sub user_normal_msg {
|
} |
} |
|
|
sub process_sent_mail { |
sub process_sent_mail { |
my ($msgsubj,$subj_prefix,$numsent,$stamp,$msgname,$msgdom,$msgcount,$context,$pid,$savemsg,$recusers,$recudoms,$baseurl,$attachmenturl,$symb,$error,$senderuname,$senderdom,$senderhome) = @_; |
my ($msgsubj,$subj_prefix,$numsent,$stamp,$msgname,$msgdom,$msgcount,$context,$pid,$savemsg,$recusers,$recudoms,$baseurl,$attachmenturl,$symb,$error,$senderuname,$senderdom) = @_; |
my $sentsubj; |
my $sentsubj; |
if ($numsent > 1) { |
if ($numsent > 1) { |
$sentsubj = $subj_prefix.' ('.$numsent.' sent) '.$msgsubj; |
$sentsubj = $subj_prefix.' ('.$numsent.' sent) '.$msgsubj; |
Line 757 sub process_sent_mail {
|
Line 754 sub process_sent_mail {
|
&packagemsg($msgsubj,$savemsg,undef,$baseurl,$attachmenturl,$recusers, |
&packagemsg($msgsubj,$savemsg,undef,$baseurl,$attachmenturl,$recusers, |
$recudoms,$sentmsgid,undef,undef,$symb,$error); |
$recudoms,$sentmsgid,undef,undef,$symb,$error); |
my $status = &store_sent_mail($sentmsgid,$sentmessage,$senderuname, |
my $status = &store_sent_mail($sentmsgid,$sentmessage,$senderuname, |
$senderdom,$senderhome); |
$senderdom); |
return $status; |
return $status; |
} |
} |
|
|
sub store_sent_mail { |
sub store_sent_mail { |
my ($msgid,$message,$senderuname,$senderdom,$senderhome) = @_; |
my ($msgid,$message,$senderuname,$senderdom) = @_; |
if ($senderuname eq '') { |
if ($senderuname eq '') { |
$senderuname = $env{'user.name'}; |
$senderuname = $env{'user.name'}; |
} |
} |
if ($senderdom eq '') { |
if ($senderdom eq '') { |
$senderdom = $env{'user.domain'}; |
$senderdom = $env{'user.domain'}; |
} |
} |
if ($senderhome eq '') { |
my $status =' '.&Apache::lonnet::cput('nohist_email_sent', |
$senderhome = $env{'user.home'}; |
{$msgid => $message}, |
} |
$senderdom,$senderuname); |
my $status =' '.&Apache::lonnet::critical( |
|
'put:'.$senderdom.':'.$senderuname.':nohist_email_sent:'. |
|
&escape($msgid).'='.&escape($message),$senderhome); |
|
return $status; |
return $status; |
} |
} |
|
|