version 1.191, 2006/12/24 22:13:19
|
version 1.193, 2006/12/27 20:42:12
|
Line 191 sub unpackagemsg {
|
Line 191 sub unpackagemsg {
|
sub buildmsgid { |
sub buildmsgid { |
my ($now,$subject,$uname,$udom,$msgcount,$course_context,$symb,$error,$pid) = @_; |
my ($now,$subject,$uname,$udom,$msgcount,$course_context,$symb,$error,$pid) = @_; |
$subject=&escape($subject); |
$subject=&escape($subject); |
|
$symb = &escape($symb); |
return(&escape($now.':'.$subject.':'.$uname.':'. |
return(&escape($now.':'.$subject.':'.$uname.':'. |
$udom.':'.$msgcount.':'.$course_context.':'.$pid.':'.$symb.':'.$error)); |
$udom.':'.$msgcount.':'.$course_context.':'.$pid.':'.$symb.':'.$error)); |
} |
} |
Line 202 sub unpackmsgid {
|
Line 203 sub unpackmsgid {
|
$processid,$symb,$error) = split(/\:/,&unescape($msgid)); |
$processid,$symb,$error) = split(/\:/,&unescape($msgid)); |
$shortsubj = &unescape($shortsubj); |
$shortsubj = &unescape($shortsubj); |
$shortsubj = &HTML::Entities::decode($shortsubj); |
$shortsubj = &HTML::Entities::decode($shortsubj); |
|
$symb = &unescape($symb); |
if (!defined($processid)) { $fromcid = ''; } |
if (!defined($processid)) { $fromcid = ''; } |
my %status=(); |
my %status=(); |
unless ($skipstatus) { |
unless ($skipstatus) { |
Line 405 sub user_crit_msg_raw {
|
Line 407 sub user_crit_msg_raw {
|
if (defined($sentmessage)) { |
if (defined($sentmessage)) { |
$$sentmessage = $packed_message; |
$$sentmessage = $packed_message; |
} |
} |
(undef,my $packed_message_no_citation) = |
if ($env{'request.course.id'} eq '') { |
|
(undef,my $packed_message_no_citation) = |
&packagemsg($subject,$message,undef,undef,undef,$user,$domain, |
&packagemsg($subject,$message,undef,undef,undef,$user,$domain, |
$msgid); |
$msgid); |
$status .= &store_sent_mail($msgid,$packed_message_no_citation); |
if ($status eq 'ok' || $status eq 'con_delayed') { |
|
&store_sent_mail($msgid,$packed_message_no_citation); |
|
} |
|
} |
} else { |
} else { |
$status='no_host'; |
$status='no_host'; |
} |
} |
Line 538 sub user_normal_msg_raw {
|
Line 544 sub user_normal_msg_raw {
|
(undef,my $packed_message_no_citation) = |
(undef,my $packed_message_no_citation) = |
&packagemsg($subject,$message,undef,$baseurl,$attachmenturl, |
&packagemsg($subject,$message,undef,$baseurl,$attachmenturl, |
$user,$domain,$currid,undef,$crsmsgid,$symb,$error); |
$user,$domain,$currid,undef,$crsmsgid,$symb,$error); |
$status .= &store_sent_mail($msgid,$packed_message_no_citation); |
if ($status eq 'ok' || $status eq 'con_delayed') { |
|
&store_sent_mail($msgid,$packed_message_no_citation); |
|
} |
} |
} |
} else { |
} else { |
$status='no_host'; |
$status='no_host'; |