--- loncom/interface/lonmsg.pm 2005/03/01 03:28:14 1.139
+++ loncom/interface/lonmsg.pm 2005/05/15 01:11:32 1.142
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines for messaging
#
-# $Id: lonmsg.pm,v 1.139 2005/03/01 03:28:14 albertel Exp $
+# $Id: lonmsg.pm,v 1.142 2005/05/15 01:11:32 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -104,7 +104,7 @@ since lonmsg already implements that fun
=cut
use strict;
-use Apache::lonnet();
+use Apache::lonnet;
use vars qw($msgcount);
use HTML::TokeParser();
use Apache::Constants qw(:common);
@@ -140,24 +140,25 @@ sub packagemsg {
my $partsubj=$subject;
$partsubj=&Apache::lonnet::escape($partsubj);
my $msgid=&Apache::lonnet::escape(
- $now.':'.$partsubj.':'.$ENV{'user.name'}.':'.
- $ENV{'user.domain'}.':'.$msgcount.':'.$$);
- my $result=''.$ENV{'user.name'}.''.
- ''.$ENV{'user.domain'}.''.
+ $now.':'.$partsubj.':'.$env{'user.name'}.':'.
+ $env{'user.domain'}.':'.$msgcount.':'.
+ $env{'request.course.id'}.':'.$$);
+ my $result=''.$env{'user.name'}.''.
+ ''.$env{'user.domain'}.''.
''.$subject.''.
''.
''.$ENV{'SERVER_NAME'}.''.
''.$ENV{'HTTP_HOST'}.''.
''.$ENV{'REMOTE_ADDR'}.''.
- ''.$ENV{'browser.type'}.''.
- ''.$ENV{'browser.os'}.''.
- ''.$ENV{'browser.version'}.''.
- ''.$ENV{'browser.mathml'}.''.
+ ''.$env{'browser.type'}.''.
+ ''.$env{'browser.os'}.''.
+ ''.$env{'browser.version'}.''.
+ ''.$env{'browser.mathml'}.''.
''.$ENV{'HTTP_USER_AGENT'}.''.
- ''.$ENV{'request.course.id'}.''.
- ''.$ENV{'request.course.sec'}.''.
- ''.$ENV{'request.role'}.''.
- ''.$ENV{'request.filename'}.''.
+ ''.$env{'request.course.id'}.''.
+ ''.$env{'request.course.sec'}.''.
+ ''.$env{'request.role'}.''.
+ ''.$env{'request.filename'}.''.
''.$msgid.''.
''.$recuser.''.
''.$recdomain.''.
@@ -209,13 +210,13 @@ sub unpackmsgid {
my ($msgid,$folder)=@_;
$msgid=&Apache::lonnet::unescape($msgid);
my $suffix=&foldersuffix($folder);
- my ($sendtime,$shortsubj,$fromname,$fromdomain)=split(/\:/,
+ my ($sendtime,$shortsubj,$fromname,$fromdomain,$count,$fromcid)=split(/\:/,
&Apache::lonnet::unescape($msgid));
my %status=&Apache::lonnet::get('email_status'.$suffix,[$msgid]);
if ($status{$msgid}=~/^error\:/) { $status{$msgid}=''; }
unless ($status{$msgid}) { $status{$msgid}='new'; }
- return ($sendtime,$shortsubj,$fromname,$fromdomain,$status{$msgid});
-}
+ return ($sendtime,$shortsubj,$fromname,$fromdomain,$status{$msgid},$fromcid);
+}
sub sendemail {
@@ -226,23 +227,19 @@ sub sendemail {
my $msg = new Mail::Send;
$msg->to($to);
$msg->subject('[LON-CAPA] '.$subject);
- my %oldENV=%ENV;
- undef(%ENV);
if (my $fh = $msg->open()) {
print $fh $body;
$fh->close;
}
- %ENV=%oldENV;
- undef(%oldENV);
}
# ==================================================== Send notification emails
sub sendnotification {
my ($to,$touname,$toudom,$subj,$crit,$text)=@_;
- my $sender=$ENV{'environment.firstname'}.' '.$ENV{'environment.lastname'};
+ my $sender=$env{'environment.firstname'}.' '.$env{'environment.lastname'};
unless ($sender=~/\w/) {
- $sender=$ENV{'user.name'}.'@'.$ENV{'user.domain'};
+ $sender=$env{'user.name'}.'@'.$env{'user.domain'};
}
my $critical=($crit?' critical':'');
$text=~s/\<\;/\300) {
+ if ((time-$env{'user.mailcheck.time'})>300) {
my %what=&Apache::lonnet::get('email_status',['recnewemail']);
&Apache::lonnet::appenv('user.mailcheck.time'=>time);
if ($what{'recnewemail'}>0) { return 1; }
@@ -370,10 +367,10 @@ sub user_crit_msg_raw {
'put:'.$domain.':'.$user.':critical:'.
&Apache::lonnet::escape($msgid).'='.
&Apache::lonnet::escape($message),$homeserver);
- if ($ENV{'request.course.id'}) {
+ if ($env{'request.course.id'}) {
&user_normal_msg_raw(
- $ENV{'course.'.$ENV{'request.course.id'}.'.num'},
- $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+ $env{'course.'.$env{'request.course.id'}.'.num'},
+ $env{'course.'.$env{'request.course.id'}.'.domain'},
'Critical ['.$user.':'.$domain.']',
$message);
}
@@ -396,8 +393,8 @@ sub user_crit_msg_raw {
&Apache::lonnet::logthis(
'Sending critical email '.$msgid.
', log status: '.
- &Apache::lonnet::log($ENV{'user.domain'},$ENV{'user.name'},
- $ENV{'user.home'},
+ &Apache::lonnet::log($env{'user.domain'},$env{'user.name'},
+ $env{'user.home'},
'Sending critical '.$msgid.' to '.$user.' at '.$domain.' with status: '
.$status));
return $status;
@@ -440,8 +437,8 @@ 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'}.' '.&mt('at').' '.$ENV{'user.domain'}.', '.$contents{'subject'},
- &mt('User').' '.$ENV{'user.name'}.' '.&mt('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').' '.
$contents{'time'}.".\n"
@@ -451,8 +448,8 @@ sub user_crit_received {
'nohist_email',{$contents{'msgid'} => $message{$msgid}});
$status.=' del: '.
&Apache::lonnet::del('critical',[$contents{'msgid'}]);
- &Apache::lonnet::log($ENV{'user.domain'},$ENV{'user.name'},
- $ENV{'user.home'},'Received critical message '.
+ &Apache::lonnet::log($env{'user.domain'},$env{'user.name'},
+ $env{'user.home'},'Received critical message '.
$contents{'msgid'}.
', '.$status);
return $status;
@@ -482,10 +479,10 @@ sub user_normal_msg_raw {
('email_status',{'recnewemail'=>time},$domain,$user);
# Into sent-mail folder
$status.=' '.&Apache::lonnet::critical(
- 'put:'.$ENV{'user.domain'}.':'.$ENV{'user.name'}.
+ 'put:'.$env{'user.domain'}.':'.$env{'user.name'}.
':nohist_email_sent:'.
&Apache::lonnet::escape($msgid).'='.
- &Apache::lonnet::escape($message),$ENV{'user.home'});
+ &Apache::lonnet::escape($message),$env{'user.home'});
} else {
$status='no_host';
}
@@ -501,8 +498,8 @@ sub user_normal_msg_raw {
&sendnotification($userenv{'permanentemail'},$user,$domain,$subject,0,
$text);
}
- &Apache::lonnet::log($ENV{'user.domain'},$ENV{'user.name'},
- $ENV{'user.home'},
+ &Apache::lonnet::log($env{'user.domain'},$env{'user.name'},
+ $env{'user.home'},
'Sending '.$msgid.' to '.$user.' at '.$domain.' with status: '.$status);
return $status;
}
@@ -559,7 +556,7 @@ sub folderlist {
($_==$interdis?' selected="selected"':'').'>'.$_.'' }
(10,20,50,100,200)).''.
'
'.
- ''.
+ ''.
($folder=~/^(new|critical)/?'':'');
}
@@ -616,6 +613,7 @@ sub makefolder {
sub movemsg {
my ($msgid,$srcfolder,$trgfolder)=@_;
+ if ($srcfolder eq 'new') { $srcfolder=''; }
my $srcsuffix=&foldersuffix($srcfolder);
my $trgsuffix=&foldersuffix($trgfolder);
@@ -766,7 +764,7 @@ sub sortedmessages {
my @temp;
foreach (@messages) {
my $msgid=&Apache::lonnet::escape($_);
- my ($sendtime,$shortsubj,$fromname,$fromdomain,$status)=
+ my ($sendtime,$shortsubj,$fromname,$fromdomain,$status,$fromcid)=
&Apache::lonmsg::unpackmsgid($msgid,$folder);
my @temp1 = ($sendtime,$shortsubj,$fromname,$fromdomain,$status,
$msgid);
@@ -781,34 +779,34 @@ sub sortedmessages {
}
#default sort
@temp = sort {$a->[0] <=> $b->[0]} @temp;
- if ($ENV{'form.sortedby'} eq "date"){
+ if ($env{'form.sortedby'} eq "date"){
@temp = sort {$a->[0] <=> $b->[0]} @temp;
}
- if ($ENV{'form.sortedby'} eq "revdate"){
+ if ($env{'form.sortedby'} eq "revdate"){
@temp = sort {$b->[0] <=> $a->[0]} @temp;
}
- if ($ENV{'form.sortedby'} eq "user"){
+ if ($env{'form.sortedby'} eq "user"){
@temp = sort {lc($a->[2]) cmp lc($b->[2])} @temp;
}
- if ($ENV{'form.sortedby'} eq "revuser"){
+ if ($env{'form.sortedby'} eq "revuser"){
@temp = sort {lc($b->[2]) cmp lc($a->[2])} @temp;
}
- if ($ENV{'form.sortedby'} eq "domain"){
+ if ($env{'form.sortedby'} eq "domain"){
@temp = sort {$a->[3] cmp $b->[3]} @temp;
}
- if ($ENV{'form.sortedby'} eq "revdomain"){
+ if ($env{'form.sortedby'} eq "revdomain"){
@temp = sort {$b->[3] cmp $a->[3]} @temp;
}
- if ($ENV{'form.sortedby'} eq "subject"){
+ if ($env{'form.sortedby'} eq "subject"){
@temp = sort {lc($a->[1]) cmp lc($b->[1])} @temp;
}
- if ($ENV{'form.sortedby'} eq "revsubject"){
+ if ($env{'form.sortedby'} eq "revsubject"){
@temp = sort {lc($b->[1]) cmp lc($a->[1])} @temp;
}
- if ($ENV{'form.sortedby'} eq "status"){
+ if ($env{'form.sortedby'} eq "status"){
@temp = sort {$a->[4] cmp $b->[4]} @temp;
}
- if ($ENV{'form.sortedby'} eq "revstatus"){
+ if ($env{'form.sortedby'} eq "revstatus"){
@temp = sort {$b->[4] cmp $a->[4]} @temp;
}
return @temp;
@@ -828,9 +826,9 @@ sub disnew {
'do' => 'Domain'
);
my @msgids = sort split(/\&/,&Apache::lonnet::reply
- ('keys:'.$ENV{'user.domain'}.':'.
- $ENV{'user.name'}.':nohist_email',
- $ENV{'user.home'}));
+ ('keys:'.$env{'user.domain'}.':'.
+ $env{'user.name'}.':nohist_email',
+ $env{'user.home'}));
my @newmsgs;
my %setters = ();
my $startblock = 0;
@@ -840,7 +838,7 @@ sub disnew {
# Check for blocking of display because of scheduled online exams.
&blockcheck(\%setters,\$startblock,\$endblock);
foreach (@msgids) {
- my ($sendtime,$shortsubj,$fromname,$fromdom,$status)=
+ my ($sendtime,$shortsubj,$fromname,$fromdom,$status,$fromcid)=
&Apache::lonmsg::unpackmsgid($_);
if (defined($sendtime) && $sendtime!~/error/) {
my $numsendtime = $sendtime;
@@ -962,31 +960,31 @@ ENDDISHEADER
$r->print(&scrollbuttons($startdis,$number,$firstdis,$lastdis,$totalnumber));
$r->print('
');
+ $r->print('');
if ($numblocked > 0) {
my $beginblock = &Apache::lonlocal::locallocaltime($startblock);
my $finishblock = &Apache::lonlocal::locallocaltime($endblock);
@@ -1046,7 +1044,7 @@ ENDDISHEADER
# ============================================================== Compose output
sub compout {
- my ($r,$forwarding,$replying,$broadcast,$replycrit,$folder)=@_;
+ my ($r,$forwarding,$replying,$broadcast,$replycrit,$folder,$dismode)=@_;
my $suffix=&foldersuffix($folder);
if ($broadcast eq 'individual') {
@@ -1087,7 +1085,7 @@ sub compout {
'ca' => 'Cancel',
'ma' => 'Mail');
- if (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) {
+ if (&Apache::lonnet::allowed('srm',$env{'request.course.id'})) {
my $crithelp = Apache::loncommon::help_open_topic("Course_Critical_Message");
$dispcrit=
' ' . $crithelp .
@@ -1099,7 +1097,7 @@ sub compout {
}
my %message;
my %content;
- my $defdom=$ENV{'user.domain'};
+ my $defdom=$env{'user.domain'};
if ($forwarding) {
%message=&Apache::lonnet::get('nohist_email'.$suffix,[$forwarding]);
%content=&unpackagemsg($message{$forwarding},$folder);
@@ -1128,7 +1126,7 @@ sub compout {
$dismsg=~s/\n+/\n\> /g;
if ($content{'baseurl'}) {
$disbase='';
- if ($ENV{'user.adv'}) {
+ if ($env{'user.adv'}) {
$disbase.=' '.
@@ -1137,7 +1135,7 @@ sub compout {
}
}
my $citation=&displayresource(%content);
- if ($ENV{'form.recdom'}) { $defdom=$ENV{'form.recdom'}; }
+ if ($env{'form.recdom'}) { $defdom=$env{'form.recdom'}; }
$r->print(
'
$dispcrit
$disbase
+
+
$citation
@@ -1219,14 +1219,14 @@ ENDUPLOAD
sub retrieve_instructor_comments {
my ($user,$domain)=@_;
- my $target=$ENV{'form.grade_target'};
- if (! $ENV{'request.course.id'}) { return; }
- if (! &Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) {
+ my $target=$env{'form.grade_target'};
+ if (! $env{'request.course.id'}) { return; }
+ if (! &Apache::lonnet::allowed('srm',$env{'request.course.id'})) {
return;
}
my %records=&Apache::lonnet::dump('nohist_email',
- $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
- $ENV{'course.'.$ENV{'request.course.id'}.'.num'},
+ $env{'course.'.$env{'request.course.id'}.'.domain'},
+ $env{'course.'.$env{'request.course.id'}.'.num'},
'%255b'.$user.'%253a'.$domain.'%255d');
my $result='';
foreach (sort(keys(%records))) {
@@ -1244,14 +1244,14 @@ sub retrieve_instructor_comments {
sub disfacetoface {
my ($r,$user,$domain)=@_;
- my $target=$ENV{'form.grade_target'};
- unless ($ENV{'request.course.id'}) { return; }
- unless (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) {
+ my $target=$env{'form.grade_target'};
+ unless ($env{'request.course.id'}) { return; }
+ unless (&Apache::lonnet::allowed('srm',$env{'request.course.id'})) {
return;
}
my %records=&Apache::lonnet::dump('nohist_email',
- $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
- $ENV{'course.'.$ENV{'request.course.id'}.'.num'},
+ $env{'course.'.$env{'request.course.id'}.'.domain'},
+ $env{'course.'.$env{'request.course.id'}.'.num'},
'%255b'.$user.'%253a'.$domain.'%255d');
my $result='';
foreach (sort keys %records) {
@@ -1294,7 +1294,7 @@ $content{'sendername'}.'@'.
sub facetoface {
my ($r,$stage)=@_;
- unless (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) {
+ unless (&Apache::lonnet::allowed('srm',$env{'request.course.id'})) {
return;
}
&printheader($r,
@@ -1302,12 +1302,12 @@ sub facetoface {
"User Notes, Face-to-Face, Critical Messages, Broadcast Messages");
# from query string
- if ($ENV{'form.recname'}) { $ENV{'form.recuname'}=$ENV{'form.recname'}; }
- if ($ENV{'form.recdom'}) { $ENV{'form.recdomain'}=$ENV{'form.recdom'}; }
+ if ($env{'form.recname'}) { $env{'form.recuname'}=$env{'form.recname'}; }
+ if ($env{'form.recdom'}) { $env{'form.recdomain'}=$env{'form.recdom'}; }
- my $defdom=$ENV{'user.domain'};
+ my $defdom=$env{'user.domain'};
# already filled in
- if ($ENV{'form.recdomain'}) { $defdom=$ENV{'form.recdomain'}; }
+ if ($env{'form.recdomain'}) { $defdom=$env{'form.recdomain'}; }
# generate output
my $domform = &Apache::loncommon::select_dom_form($defdom,'recdomain');
my $stdbrws = &Apache::loncommon::selectstudent_link
@@ -1323,7 +1323,7 @@ sub facetoface {