[LON-CAPA-cvs] cvs: loncom /interface loncommunicate.pm lonmsg.pm
www
lon-capa-cvs@mail.lon-capa.org
Mon, 24 Jun 2002 14:33:22 -0000
www Mon Jun 24 10:33:22 2002 EDT
Modified files:
/loncom/interface loncommunicate.pm lonmsg.pm
Log:
Get rid of spurious error-message-email if user did never have email.
Index: loncom/interface/loncommunicate.pm
diff -u loncom/interface/loncommunicate.pm:1.9 loncom/interface/loncommunicate.pm:1.10
--- loncom/interface/loncommunicate.pm:1.9 Tue May 7 15:24:28 2002
+++ loncom/interface/loncommunicate.pm Mon Jun 24 10:33:21 2002
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Communicate
#
-# $Id: loncommunicate.pm,v 1.9 2002/05/07 19:24:28 matthew Exp $
+# $Id: loncommunicate.pm,v 1.10 2002/06/24 14:33:21 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -91,6 +91,7 @@
foreach (@msgids) {
my ($sendtime,$shortsubj,$fromname,$fromdom,$status)=
&Apache::lonmsg::unpackmsgid($_);
+ if ($sendtime!~/error/) {
$sendtime = localtime($sendtime);
if ($status eq 'new') {
push @newmsgs, {
@@ -101,6 +102,7 @@
fromdom => $fromdom
}
}
+ }
}
if ($#newmsgs >= 0) {
$r->print(<<TABLEHEAD);
Index: loncom/interface/lonmsg.pm
diff -u loncom/interface/lonmsg.pm:1.32 loncom/interface/lonmsg.pm:1.33
--- loncom/interface/lonmsg.pm:1.32 Tue May 7 11:24:34 2002
+++ loncom/interface/lonmsg.pm Mon Jun 24 10:33:21 2002
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines for messaging
#
-# $Id: lonmsg.pm,v 1.32 2002/05/07 15:24:34 matthew Exp $
+# $Id: lonmsg.pm,v 1.33 2002/06/24 14:33:21 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -396,7 +396,7 @@
$ENV{'user.home'}))) {
my ($sendtime,$shortsubj,$fromname,$fromdomain,$status)=
&Apache::lonmsg::unpackmsgid($_);
- unless ($status eq 'deleted') {
+ unless (($status eq 'deleted') || ($sendtime=~/error/)) {
if ($status eq 'new') {
$r->print('<tr bgcolor="#FFBB77">');
} elsif ($status eq 'read') {