--- loncom/interface/lonmsg.pm 2005/05/20 17:00:40 1.143
+++ loncom/interface/lonmsg.pm 2005/11/23 22:32:11 1.156
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines for messaging
#
-# $Id: lonmsg.pm,v 1.143 2005/05/20 17:00:40 albertel Exp $
+# $Id: lonmsg.pm,v 1.156 2005/11/23 22:32:11 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -114,6 +114,8 @@ use HTML::Entities();
use Mail::Send;
use Apache::lonlocal;
use Apache::loncommunicate;
+use Apache::lonfeedback;
+use Apache::lonrss();
# Querystring component with sorting type
my $sqs;
@@ -124,7 +126,7 @@ my $interdis;
sub packagemsg {
my ($subject,$message,$citation,$baseurl,$attachmenturl,
- $recuser,$recdomain)=@_;
+ $recuser,$recdomain,$msgid)=@_;
$message =&HTML::Entities::encode($message,'<>&"');
$citation=&HTML::Entities::encode($citation,'<>&"');
$subject =&HTML::Entities::encode($subject,'<>&"');
@@ -139,10 +141,12 @@ sub packagemsg {
$msgcount++;
my $partsubj=$subject;
$partsubj=&Apache::lonnet::escape($partsubj);
- my $msgid=&Apache::lonnet::escape(
+ unless(defined($msgid)) {
+ $msgid=&Apache::lonnet::escape(
$now.':'.$partsubj.':'.$env{'user.name'}.':'.
$env{'user.domain'}.':'.$msgcount.':'.
$env{'request.course.id'}.':'.$$);
+ }
my $result=''.$env{'user.name'}.''.
''.$env{'user.domain'}.''.
''.$subject.''.
@@ -159,10 +163,17 @@ sub packagemsg {
''.$env{'request.course.sec'}.''.
''.$env{'request.role'}.''.
''.$env{'request.filename'}.''.
- ''.$msgid.''.
- ''.$recuser.''.
- ''.$recdomain.''.
- ''.$message.'';
+ ''.$msgid.'';
+ if (ref($recuser) eq 'ARRAY') {
+ for (my $i=0; $i<@{$recuser}; $i++) {
+ $result .= ''.$$recuser[$i].''.
+ ''.$$recdomain[$i].'';
+ }
+ } else {
+ $result .= ''.$recuser.''.
+ ''.$recdomain.'';
+ }
+ $result .= ''.$message.'';
if (defined($citation)) {
$result.=''.$citation.'';
}
@@ -186,7 +197,11 @@ sub unpackagemsg {
if ($token->[0] eq 'S') {
my $entry=$token->[1];
my $value=$parser->get_text('/'.$entry);
- $content{$entry}=$value;
+ if (($entry eq 'recuser') || ($entry eq 'recdomain')) {
+ push(@{$content{$entry}},$value);
+ } else {
+ $content{$entry}=$value;
+ }
}
}
if ($content{'attachmenturl'}) {
@@ -337,7 +352,20 @@ sub del_url_author_res_msg {
}
return &Apache::lonnet::del('nohist_res_msgs',\@delmsgs,$domain,$author);
}
+# =================================== Clear out all author messages in URL path
+sub clear_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/) {
+ 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 {
@@ -459,7 +487,7 @@ sub user_crit_received {
sub user_normal_msg_raw {
my ($user,$domain,$subject,$message,$citation,$baseurl,$attachmenturl,
- $toperm)=@_;
+ $toperm,$newid)=@_;
# Check if allowed missing
my $status='';
my $msgid='undefined';
@@ -477,15 +505,16 @@ sub user_normal_msg_raw {
# Save new message received time
&Apache::lonnet::put
('email_status',{'recnewemail'=>time},$domain,$user);
-# Into sent-mail folder
- $status.=' '.&Apache::lonnet::critical(
- 'put:'.$env{'user.domain'}.':'.$env{'user.name'}.
- ':nohist_email_sent:'.
- &Apache::lonnet::escape($msgid).'='.
- &Apache::lonnet::escape($message),$env{'user.home'});
+# Into sent-mail folder unless a broadcast message
+ unless (($env{'request.course.id'}) && ($env{'form.sendmode'} eq 'group')) {
+ $status .= &store_sent_mail($msgid,$message);
+ }
} else {
$status='no_host';
}
+ if (defined($newid)) {
+ $$newid = $msgid;
+ }
# Notifications
my %userenv = &Apache::lonnet::get('environment',['notification',
'permanentemail'],
@@ -535,6 +564,15 @@ sub user_normal_msg {
return $status;
}
+sub store_sent_mail {
+ my ($msgid,$message) = @_;
+ my $status =' '.&Apache::lonnet::critical(
+ 'put:'.$env{'user.domain'}.':'.$env{'user.name'}.
+ ':nohist_email_sent:'.
+ &Apache::lonnet::escape($msgid).'='.
+ &Apache::lonnet::escape($message),$env{'user.home'});
+ return $status;
+}
# ============================================================ List all folders
@@ -564,13 +602,14 @@ sub scrollbuttons {
my ($start,$maxdis,$first,$finish,$total)=@_;
unless ($total>0) { return ''; }
$start++; $maxdis++;$first++;$finish++;
- return
+ return
+ &mt('Page').': '.
''.
''.
' of '.$maxdis.
''.
'
'.
- &mt('Messages [_1] through [_2] of [_3]',$first,$finish,$total).'';
+ &mt('Showing messages [_1] through [_2] of [_3]',$first,$finish,$total).'';
}
# =============================================================== Folder suffix
@@ -596,6 +635,9 @@ sub statuschange {
if (($newstatus eq 'deleted') || ($newstatus eq 'new')) {
&Apache::lonnet::put('email_status'.$suffix,{$msgid => $newstatus});
}
+ if ($newstatus eq 'deleted') {
+ &movemsg(&Apache::lonnet::unescape($msgid),$folder,'trash');
+ }
}
# ============================================================= Make new folder
@@ -869,7 +911,8 @@ sub disnew {
TABLEHEAD
foreach my $msg (@newmsgs) {
$r->print(<<"ENDLINK");
-
+
$lt{'op'} |
ENDLINK
foreach ('sendtime','from','fromdom','shortsub') {
@@ -996,13 +1039,13 @@ ENDDISHEADER
my ($sendtime,$shortsubj,$fromname,$fromdomain,$status,$origID)= @{$temp[$n]};
if (($status ne 'deleted') && defined($sendtime) && $sendtime!~/error/) {
if ($status eq 'new') {
- $r->print('
');
+ $r->print('
');
} elsif ($status eq 'read') {
- $r->print('
');
+ $r->print('
');
} elsif ($status eq 'replied') {
- $r->print('
');
+ $r->print('
');
} else {
- $r->print('
');
+ $r->print('
');
}
$r->print(' | '.&mt('Open').' | '.
@@ -1095,8 +1138,9 @@ sub compout {
'' . $crithelp .
'';
- }
+&mt('Send copy to permanent email address (if known)').''.
+''; }
my %message;
my %content;
my $defdom=$env{'user.domain'};
@@ -1173,7 +1217,7 @@ ENDREC
|
$lt{'sb'}: |
|
$latexHelp
-