--- loncom/interface/lonmsg.pm 2003/12/30 20:39:30 1.74
+++ loncom/interface/lonmsg.pm 2004/01/31 02:42:44 1.84
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines for messaging
#
-# $Id: lonmsg.pm,v 1.74 2003/12/30 20:39:30 www Exp $
+# $Id: lonmsg.pm,v 1.84 2004/01/31 02:42:44 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -25,23 +25,8 @@
#
# http://www.lon-capa.org/
#
-#
-# (Routines to control the menu
-#
-# (TeX Conversion Module
-#
-# 05/29/00,05/30 Gerd Kortemeyer)
-#
-# 10/05 Gerd Kortemeyer)
-#
-# 10/19,10/20,10/30,
-# 02/06/01 Gerd Kortemeyer
-# 07/27 Guy Albertelli
-# 07/27,07/28,07/30,08/03,08/06,08/08,08/09,08/10,8/13,8/15,
-# 10/1,11/5 Gerd Kortemeyer
-# YEAR=2002
-# 1/1,3/18 Gerd Kortemeyer
-#
+
+
package Apache::lonmsg;
=pod
@@ -287,9 +272,10 @@ sub author_res_msg {
# =========================================== Retrieve author resource messages
sub retrieve_author_res_msg {
- my ($author,$domain,$url)=@_;
+ my $url=shift;
$url=&Apache::lonnet::declutter($url);
- my %errormsgs=&Apache::lonnet::dump('nohist_res_msgs',$1,$2);
+ my ($domain,$author)=($url=~/^(\w+)\/(\w+)\//);
+ my %errormsgs=&Apache::lonnet::dump('nohist_res_msgs',$domain,$author);
my $msgs='';
foreach (keys %errormsgs) {
if ($_=~/^\Q$url\E\_\d+$/) {
@@ -306,14 +292,28 @@ sub retrieve_author_res_msg {
# =============================== Delete all author messages related to one URL
sub del_url_author_res_msg {
- my ($author,$domain,$url)=@_;
+ my $url=shift;
$url=&Apache::lonnet::declutter($url);
+ my ($domain,$author)=($url=~/^(\w+)\/(\w+)\//);
+ my @delmsgs=();
+ foreach (&Apache::lonnet::getkeys('nohist_res_msgs',$domain,$author)) {
+ if ($_=~/^\Q$url\E\_\d+$/) {
+ push (@delmsgs,$_);
+ }
+ }
+ return &Apache::lonnet::del('nohist_res_msgs',\@delmsgs,$domain,$author);
}
# ================= Return hash with URLs for which there is a resource message
sub all_url_author_res_msg {
my ($author,$domain)=@_;
+ my %returnhash=();
+ foreach (&Apache::lonnet::getkeys('nohist_res_msgs',$domain,$author)) {
+ $_=~/^(.+)\_\d+/;
+ $returnhash{$1}=1;
+ }
+ return %returnhash;
}
# ================================================== Critical message to a user
@@ -396,7 +396,7 @@ sub user_crit_received {
my %contents=&unpackagemsg($message{$msgid},1);
my $status='rec: '.($contents{'sendback'}?
&user_normal_msg($contents{'sendername'},$contents{'senderdomain'},
- &mt('Receipt').': '.$ENV{'user.name'}.' at '.$ENV{'user.domain'},
+ &mt('Receipt').': '.$ENV{'user.name'}.' '.&mt('at').' '.$ENV{'user.domain'}.', '.$contents{'subject'},
&mt('User').' '.$ENV{'user.name'}.' '.&mt('at').' '.$ENV{'user.domain'}.
' acknowledged receipt of message'."\n".' "'.
$contents{'subject'}.'"'."\n".&mt('dated').' '.
@@ -599,7 +599,9 @@ $content{'sendername'}.'@'.
'
'.&mt('Subject').': '.$content{'subject'}.
'
'. &Apache::lontexconvert::msgtexconverted($content{'message'}). - ''. + ''. +&mt('You have to confirm that you received this message. After confirmation, this message will be moved to your regular inbox'). + '
'. - &Apache::lontexconvert::msgtexconverted($content{'message'}). + &Apache::lontexconvert::msgtexconverted($content{'message'},1). '