version 1.123, 2017/05/19 18:23:19
|
version 1.125, 2017/09/13 23:35:07
|
Line 1325 sub getnormalmail {
|
Line 1325 sub getnormalmail {
|
if ($emailstatus{$msgid} eq 'new') { |
if ($emailstatus{$msgid} eq 'new') { |
$skipstatus = 1; |
$skipstatus = 1; |
} |
} |
|
my $esc_msgid = &escape($msgid); |
my ($sendtime,$shortsubj,$fromname,$fromdom,$status,$fromcid)= |
my ($sendtime,$shortsubj,$fromname,$fromdom,$status,$fromcid)= |
&Apache::lonmsg::unpackmsgid($msgid,undef,$skipstatus,undef, |
&Apache::lonmsg::unpackmsgid($esc_msgid,undef,$skipstatus,undef, |
$env{'request.course.id'}); |
$env{'request.course.id'}); |
if (($fromcid) && ($fromcid eq $env{'request.course.id'})) { |
if (($fromcid) && ($fromcid eq $env{'request.course.id'})) { |
if (defined($sendtime) && $sendtime!~/error/) { |
if (defined($sendtime) && $sendtime!~/error/) { |
Line 1337 sub getnormalmail {
|
Line 1338 sub getnormalmail {
|
$shortsubj = &mt('No subject'); |
$shortsubj = &mt('No subject'); |
} |
} |
push(@{$newmsgs}, { |
push(@{$newmsgs}, { |
msgid => $msgid, |
msgid => $esc_msgid, |
sendtime => $sendtime, |
sendtime => $sendtime, |
shortsub => $shortsubj, |
shortsub => $shortsubj, |
from => $fromname, |
from => $fromname, |
Line 1358 sub getcritmail {
|
Line 1359 sub getcritmail {
|
my $result = ''; |
my $result = ''; |
my $critmsgcount = 0; |
my $critmsgcount = 0; |
foreach my $msgid (sort(keys(%what))) { |
foreach my $msgid (sort(keys(%what))) { |
|
my $esc_msgid = &escape($msgid); |
my ($sendtime,$shortsubj,$fromname,$fromdom,$status,$fromcid)= |
my ($sendtime,$shortsubj,$fromname,$fromdom,$status,$fromcid)= |
&Apache::lonmsg::unpackmsgid($msgid,undef,1,undef, |
&Apache::lonmsg::unpackmsgid($esc_msgid,undef,1,undef, |
$env{'request.course.id'}); |
$env{'request.course.id'}); |
if (($fromcid) && ($fromcid eq $env{'request.course.id'})) { |
if (($fromcid) && ($fromcid eq $env{'request.course.id'})) { |
if (defined($sendtime) && $sendtime!~/error/) { |
if (defined($sendtime) && $sendtime!~/error/) { |
Line 1369 sub getcritmail {
|
Line 1371 sub getcritmail {
|
$shortsubj = &mt('No subject'); |
$shortsubj = &mt('No subject'); |
} |
} |
push(@{$critmsgs}, { |
push(@{$critmsgs}, { |
msgid => $msgid, |
msgid => $esc_msgid, |
sendtime => $sendtime, |
sendtime => $sendtime, |
shortsub => $shortsubj, |
shortsub => $shortsubj, |
from => $fromname, |
from => $fromname, |