--- loncom/interface/lonmsg.pm 2003/10/18 16:33:44 1.70
+++ loncom/interface/lonmsg.pm 2004/05/10 22:39:51 1.100
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines for messaging
#
-# $Id: lonmsg.pm,v 1.70 2003/10/18 16:33:44 www Exp $
+# $Id: lonmsg.pm,v 1.100 2004/05/10 22:39:51 albertel 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
@@ -116,6 +101,7 @@ use Apache::lontexconvert();
use HTML::Entities();
use Mail::Send;
use Apache::lonlocal;
+use Apache::loncommunicate;
# Querystring component with sorting type
my $sqs;
@@ -124,15 +110,15 @@ my $sqs;
sub packagemsg {
my ($subject,$message,$citation,$baseurl,$attachmenturl)=@_;
- $message =&HTML::Entities::encode($message);
- $citation=&HTML::Entities::encode($citation);
- $subject =&HTML::Entities::encode($subject);
+ $message =&HTML::Entities::encode($message,'<>&"');
+ $citation=&HTML::Entities::encode($citation,'<>&"');
+ $subject =&HTML::Entities::encode($subject,'<>&"');
#remove machine specification
$baseurl =~ s|^http://[^/]+/|/|;
- $baseurl =&HTML::Entities::encode($baseurl);
+ $baseurl =&HTML::Entities::encode($baseurl,'<>&"');
#remove machine specification
$attachmenturl =~ s|^http://[^/]+/|/|;
- $attachmenturl =&HTML::Entities::encode($attachmenturl);
+ $attachmenturl =&HTML::Entities::encode($attachmenturl,'<>&"');
my $now=time;
$msgcount++;
@@ -154,6 +140,7 @@ sub packagemsg {
''.$ENV{'browser.mathml'}.' '.
''.$ENV{'HTTP_USER_AGENT'}.' '.
''.$ENV{'request.course.id'}.' '.
+ ''.$ENV{'request.course.sec'}.' '.
''.$ENV{'request.role'}.' '.
''.$ENV{'request.filename'}.' '.
''.$msgid.' '.
@@ -185,13 +172,15 @@ sub unpackagemsg {
}
}
if ($content{'attachmenturl'}) {
- my ($fname,$ft)=($content{'attachmenturl'}=~/\/(\w+)\.(\w+)$/);
+ my ($fname)=($content{'attachmenturl'}=~m|/([^/]+)$|);
if ($notoken) {
- $content{'message'}.=''.&mt('Attachment').': '.$fname.'.'.$ft.' ';
+ $content{'message'}.='
'.&mt('Attachment').': '.$fname.' ';
} else {
- $content{'message'}.='
'.&mt('Attachment').': '.$fname.'.'.$ft.'
'.&mt('Attachment').
+ ': '.
+ $fname.'
'.
+ $content{'time'}.' : '.$content{'message'}.
+ '
';
+ }
+ }
+ return $msgs;
+}
+
+
+# =============================== Delete all author messages related to one URL
+
+sub del_url_author_res_msg {
+ 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
sub user_crit_msg_raw {
@@ -364,7 +400,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').' '.
@@ -475,7 +511,7 @@ sub discourse {
'cfs' => 'Check for Section/Group',
'cfn' => 'Check for None');
$r->print(<
+
ENDDISHEADER
my %coursepersonnel=
@@ -567,7 +603,9 @@ $content{'sendername'}.'@'.
'
'.
&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').
+ ' ';
- }
- my %lt=&Apache::lonlocal::texthash(
- 'to' => 'To',
- 'sb' => 'Subject',
- 'sr' => 'Send Reply',
- 'ca' => 'Cancel'
- );
- $r->print(<<"ENDREPLY");
-
-ENDREPLY
-}
-
sub sortedmessages {
my @messages = &Apache::lonnet::getkeys('nohist_email');
#unpack the varibles and repack into temp for sorting
@@ -748,7 +741,7 @@ ENDDISHEADER
}
$r->print(''.&mt('Open').' '.&mt('Delete').' '.&Apache::lonlocal::locallocaltime($sendtime).' '.
$fromname.' '.$fromdomain.' '.
&Apache::lonnet::unescape($shortsubj).' '.
@@ -759,15 +752,42 @@ ENDDISHEADER
''.&mt('Check All').' '.
''.&mt('Uncheck All').' '.
'
'.
+ $content{'time'}.': '.$content{'message'}.
+ '