--- loncom/interface/lonmsg.pm 2004/07/15 21:08:45 1.104 +++ loncom/interface/lonmsg.pm 2004/09/20 15:01:56 1.108 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Routines for messaging # -# $Id: lonmsg.pm,v 1.104 2004/07/15 21:08:45 matthew Exp $ +# $Id: lonmsg.pm,v 1.108 2004/09/20 15:01:56 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -117,11 +117,14 @@ use Apache::loncommunicate; # Querystring component with sorting type my $sqs; +my $startdis; +my $interdis; # ===================================================================== Package sub packagemsg { - my ($subject,$message,$citation,$baseurl,$attachmenturl)=@_; + my ($subject,$message,$citation,$baseurl,$attachmenturl, + $recuser,$recdomain)=@_; $message =&HTML::Entities::encode($message,'<>&"'); $citation=&HTML::Entities::encode($citation,'<>&"'); $subject =&HTML::Entities::encode($subject,'<>&"'); @@ -156,6 +159,8 @@ sub packagemsg { ''.$ENV{'request.role'}.''. ''.$ENV{'request.filename'}.''. ''.$msgid.''. + ''.$recuser.''. + ''.$recdomain.''. ''.$message.''; if (defined($citation)) { $result.=''.$citation.''; @@ -201,10 +206,12 @@ sub unpackagemsg { # ======================================================= Get info out of msgid sub unpackmsgid { - my $msgid=&Apache::lonnet::unescape(shift); + my ($msgid,$folder)=@_; + $msgid=&Apache::lonnet::unescape($msgid); + my $suffix=&foldersuffix($folder); my ($sendtime,$shortsubj,$fromname,$fromdomain)=split(/\:/, &Apache::lonnet::unescape($msgid)); - my %status=&Apache::lonnet::get('email_status',[$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}); @@ -445,13 +452,21 @@ sub user_normal_msg_raw { my $homeserver=&Apache::lonnet::homeserver($user,$domain); if ($homeserver ne 'no_host') { ($msgid,$message)=&packagemsg($subject,$message,$citation,$baseurl, - $attachmenturl); + $attachmenturl,$user,$domain); +# Store in user folder $status=&Apache::lonnet::critical( 'put:'.$domain.':'.$user.':nohist_email:'. &Apache::lonnet::escape($msgid).'='. &Apache::lonnet::escape($message),$homeserver); +# 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'}); } else { $status='no_host'; } @@ -498,20 +513,87 @@ sub user_normal_msg { } +# ============================================================ List all folders + +sub folderlist { + my $folder=shift; + my @allfolders=&Apache::lonnet::getkeys('email_folders'); + if ($allfolders[0]=~/^error:/) { @allfolders=(); } + return '
'. + &mt('Folder').': '. + &Apache::loncommon::select_form($folder,'folder', + ('' => &mt('INBOX'),'trash' => &mt('TRASH'), + 'sent' => &mt('Sent Messages'), + map { $_ => $_ } @allfolders)). + ' '.&mt('Show').' '. + &Apache::loncommon::select_form($interdis,'interdis', +(' 10' => '10', ' 20' => '20', ' 50' => '50', '100' => '100', '200' => '200')). + '
'. + ''. + ''. + ''. + ''. + ''. + ''. + &mt('View Critical Messages').''. + '
'; +} + +# =============================================================== Folder suffix + +sub foldersuffix { + my $folder=shift; + unless ($folder) { return ''; } + return '_'.&Apache::lonnet::escape($folder); +} + # =============================================================== Status Change sub statuschange { - my ($msgid,$newstatus)=@_; - my %status=&Apache::lonnet::get('email_status',[$msgid]); + my ($msgid,$newstatus,$folder)=@_; + my $suffix=&foldersuffix($folder); + my %status=&Apache::lonnet::get('email_status'.$suffix,[$msgid]); if ($status{$msgid}=~/^error\:/) { $status{$msgid}=''; } unless ($status{$msgid}) { $status{$msgid}='new'; } unless (($status{$msgid} eq 'replied') || ($status{$msgid} eq 'forwarded')) { - &Apache::lonnet::put('email_status',{$msgid => $newstatus}); + &Apache::lonnet::put('email_status'.$suffix,{$msgid => $newstatus}); } if (($newstatus eq 'deleted') || ($newstatus eq 'new')) { - &Apache::lonnet::put('email_status',{$msgid => $newstatus}); + &Apache::lonnet::put('email_status'.$suffix,{$msgid => $newstatus}); + } +} + +# ============================================================= Make new folder + +sub makefolder { + my ($newfolder)=@_; + &Apache::lonnet::put('email_folders',{$newfolder => time}); +} + +# ======================================================== Move between folders + +sub movemsg { + my ($msgid,$srcfolder,$trgfolder)=@_; + my $unmsgid=&Apache::lonnet::unescape($msgid); + my $srcsuffix=&foldersuffix($srcfolder); + my $trgsuffix=&foldersuffix($trgfolder); + +# Copy message + my %message=&Apache::lonnet::get('nohist_email'.$srcsuffix,[$msgid]); + &Apache::lonnet::put('nohist_email'.$trgsuffix,{$msgid => $message{$msgid}}); + +# Copy status + my %status=&Apache::lonnet::get('email_status'.$srcsuffix,[$unmsgid]); + &Apache::lonnet::put('email_status'.$trgsuffix,{$unmsgid => $status{$unmsgid}}); +# See if was deleted -> becomes "read" in trash + my $currentstatus=(&unpackmsgid($status{$unmsgid}),$srcfolder); + if ($currentstatus eq 'deleted') { + &statuschange($msgid,'read',$trgfolder); } +# Delete orginals + &Apache::lonnet::del('nohist_email'.$srcsuffix,[$msgid]); + &Apache::lonnet::del('email_status'.$srcsuffix,[$unmsgid]); } # ======================================================= Display a course list @@ -611,13 +693,13 @@ sub discrit { my %content=&unpackagemsg($what{$_}); next if ($content{'senderdomain'} eq ''); $content{'message'}=~s/\n/\/g; - $result.='
'.&mt('From').': '. + $result.='
'.&mt('From').': '. &Apache::loncommon::aboutmewrapper( &Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),$content{'sendername'},$content{'senderdomain'}).' ('. $content{'sendername'}.'@'. $content{'senderdomain'}.') '.$content{'time'}. - '
'.&mt('Subject').': '.$content{'subject'}. - '
'. + '
'.&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'). @@ -629,23 +711,25 @@ $content{'sendername'}.'@'. # Check to see if there were any messages. if ($result eq '') { $result = "

".&mt('You have no critical messages.')."

". - ''.&mt('Select a course').''; + ''.&mt('Select a course').'
'. + ''.&mt('Communicate').''; } else { $r->print($header); } $r->print($result); - $r->print(''); + $r->print(''); } sub sortedmessages { - my ($blocked,$startblock,$endblock,$numblocked) = @_; - my @messages = &Apache::lonnet::getkeys('nohist_email'); + my ($blocked,$startblock,$endblock,$numblocked,$folder) = @_; + my $suffix=&foldersuffix($folder); + my @messages = &Apache::lonnet::getkeys('nohist_email'.$suffix); #unpack the varibles and repack into temp for sorting my @temp; foreach (@messages) { my $msgid=&Apache::lonnet::escape($_); my ($sendtime,$shortsubj,$fromname,$fromdomain,$status)= - &Apache::lonmsg::unpackmsgid($msgid); + &Apache::lonmsg::unpackmsgid($msgid,$folder); my @temp1 = ($sendtime,$shortsubj,$fromname,$fromdomain,$status, $msgid); # Check whether message was sent during blocking period. @@ -695,7 +779,7 @@ sub sortedmessages { # ======================================================== Display all messages sub disall { - my $r=shift; + my ($r,$folder)=@_; my %blocked = (); my %setters = (); my $startblock; @@ -723,42 +807,50 @@ sub disall { } ENDDISHEADER - $r->print('

'.&mt('Display All Messages').'

'. - ''. ''); if ($counter > 0){ $r->print('
 '); + my $fsqs='&folder='.$folder; + my @temp=sortedmessages(\%blocked,$startblock,$endblock,\$numblocked,$folder); + my $totalnumber=$#temp+1; + my $number=int($totalnumber/$interdis)+1; + my $firstdis=$interdis*$startdis; + if ($firstdis>$#temp) { $firstdis=$#temp-$interdis+1; } + my $lastdis=$firstdis+$interdis-1; + if ($lastdis>$#temp) { $lastdis=$#temp; } + $r->print('

'.&mt('Display All Messages').'

'. + &folderlist($folder). + ''. + ''); + $r->print(''.&mt('Date').''); } else { - $r->print(''.&mt('Date').''); + $r->print(''.&mt('Date').''); } $r->print(''); + $r->print(''.&mt('Status').''); } else { - $r->print(''.&mt('Status').''); + $r->print(''.&mt('Status').''); } $r->print(''); - my @temp=sortedmessages(\%blocked,$startblock,$endblock,\$numblocked); - foreach (@temp){ - my ($sendtime,$shortsubj,$fromname,$fromdomain,$status,$origID)= @$_; + for (my $n=$firstdis;$n<=$lastdis;$n++) { + my ($sendtime,$shortsubj,$fromname,$fromdomain,$status,$origID)= @{$temp[$n]}; if (($status ne 'deleted') && defined($sendtime) && $sendtime!~/error/) { if ($status eq 'new') { $r->print(''); @@ -769,21 +861,35 @@ ENDDISHEADER } else { $r->print(''); } - $r->print(''. + $r->print(''. ''); + } elsif ($status eq 'deleted') { +# purge + &movemsg(&Apache::lonnet::unescape($origID),$folder,'trash'); } } $r->print('
 '); if ($ENV{'form.sortedby'} eq "revdate") { - $r->print(''.&mt('Date').''); if ($ENV{'form.sortedby'} eq "revuser") { - $r->print(''.&mt('Username').''); + $r->print(''.&mt('Username').''); } else { - $r->print(''.&mt('Username').''); + $r->print(''.&mt('Username').''); } $r->print(''); if ($ENV{'form.sortedby'} eq "revdomain") { - $r->print(''.&mt('Domain').''); + $r->print(''.&mt('Domain').''); } else { - $r->print(''.&mt('Domain').''); + $r->print(''.&mt('Domain').''); } $r->print(''); if ($ENV{'form.sortedby'} eq "revsubject") { - $r->print(''.&mt('Subject').''); + $r->print(''.&mt('Subject').''); } else { - $r->print(''.&mt('Subject').''); + $r->print(''.&mt('Subject').''); } $r->print(''); if ($ENV{'form.sortedby'} eq "revstatus") { - $r->print(''.&mt('Status').'
'.&mt('Open').''.&mt('Delete').''.&mt('Open').''. + ($folder ne 'trash'?''.&mt('Delete'):' ').''.&Apache::lonlocal::locallocaltime($sendtime).''. $fromname.''.$fromdomain.''. &Apache::lonnet::unescape($shortsubj).''. $status.'

'. - ''.&mt('Check All').' '. - ''.&mt('Uncheck All').'

'. - ''. - ''. - ''); + ''.&mt('Check All').' '. + ''.&mt('Uncheck All').'

'. + ''); + if ($folder ne 'trash') { + $r->print( + '

'); + } +$r->print('

'); + my @allfolders=&Apache::lonnet::getkeys('email_folders'); + if ($allfolders[0]=~/^error:/) { @allfolders=(); } + $r->print( + &Apache::loncommon::select_form('','movetofolder', + ( map { $_ => $_ } @allfolders)) + ); + $r->print(''); if ($numblocked > 0) { my $beginblock = &Apache::lonlocal::locallocaltime($startblock); my $finishblock = &Apache::lonlocal::locallocaltime($endblock); @@ -791,13 +897,12 @@ ENDDISHEADER $numblocked.' '.&mt('message(s) is/are not viewable because display of LON-CAPA messages sent to you by other students between').' '.$beginblock.' '.&mt('and').' '.$finishblock.' '.&mt('is currently being blocked because of online exams.')); &build_block_table($r,$startblock,$endblock,\%setters); } - $r->print(''); } # ============================================================== Compose output sub compout { - my ($r,$forwarding,$replying,$broadcast,$replycrit)=@_; + my ($r,$forwarding,$replying,$broadcast,$replycrit,$folder)=@_; if ($broadcast eq 'individual') { &printheader($r,'/adm/email?compose=individual', @@ -849,7 +954,7 @@ sub compout { my $defdom=$ENV{'user.domain'}; if ($forwarding) { %message=&Apache::lonnet::get('nohist_email',[$forwarding]); - %content=&unpackagemsg($message{$forwarding}); + %content=&unpackagemsg($message{$forwarding},$folder); $dispcrit.=''; $func=&mt('Forward'); @@ -860,10 +965,10 @@ sub compout { } if ($replying) { %message=&Apache::lonnet::get('nohist_email',[$replying]); - %content=&unpackagemsg($message{$replying}); - $dispcrit.=''; - $func=&mt('Replying to'); + %content=&unpackagemsg($message{$replying},$folder); + $dispcrit.=''; + $func=&mt('Send Reply to'); $dissub=&mt('Reply').': '.$content{'subject'}; $dismsg='> '.$content{'message'}; @@ -1462,7 +1567,8 @@ END # ----------------------------------------------------------- Display a message sub displaymessage { - my ($r,$msgid)=@_; + my ($r,$msgid,$folder)=@_; + my $suffix=&foldersuffix($folder); my %blocked = (); my %setters = (); my $startblock = 0; @@ -1470,16 +1576,17 @@ sub displaymessage { my $numblocked = 0; # info to generate "next" and "previous" buttons and check if message is blocked &blockcheck(\%setters,\$startblock,\$endblock); - my @messages=&sortedmessages(\%blocked,$startblock,$endblock,\$numblocked); + my @messages=&sortedmessages(\%blocked,$startblock,$endblock,\$numblocked,$folder); if ( $blocked{$msgid} eq 'ON' ) { &printheader($r,'/adm/email',&mt('Display a Message')); $r->print(&mt('You attempted to display a message that is currently blocked because you are enrolled in one or more courses for which there is an ongoing online exam.')); &build_block_table($r,$startblock,$endblock,\%setters); return; } - &statuschange($msgid,'read'); - my %message=&Apache::lonnet::get('nohist_email',[$msgid]); + &statuschange($msgid,'read',$folder); + my %message=&Apache::lonnet::get('nohist_email'.$suffix,[$msgid]); my %content=&unpackagemsg($message{$msgid}); + my $counter=0; $r->print('

');
     my $escmsgid=&Apache::lonnet::escape($msgid);
@@ -1505,6 +1612,7 @@ sub displaymessage {
 	      '
Delete'.&mt('Display all Messages').'12,bug=>'Communication Tools',}); +# ------------------------------------------------------------------ Get Folder + + my $folder=$ENV{'form.folder'}; + unless ($folder) { + $folder=''; + } else { + $sqs='&folder='.&Apache::lonnet::escape($folder); + } + +# --------------------------------------------------------------------- Display + + $startdis=$ENV{'form.startdis'}; + unless ($startdis) { $startdis=0; } + $interdis=$ENV{'form.interdis'}; + unless ($interdis) { $interdis=20; } + # --------------------------------------------------------------- Render Output if ($ENV{'form.display'}) { - &displaymessage($r,$ENV{'form.display'}); + &displaymessage($r,$ENV{'form.display'},$folder); } elsif ($ENV{'form.replyto'}) { - &compout($r,'',$ENV{'form.replyto'}); + &compout($r,'',$ENV{'form.replyto'},undef,undef,$folder); } elsif ($ENV{'form.confirm'}) { &printheader($r,'','Confirmed Receipt'); foreach (keys %ENV) { @@ -1616,23 +1748,35 @@ sub handler { &compout($r,$ENV{'form.forward'}); } elsif ($ENV{'form.markdel'}) { &printheader($r,'','Deleted Message'); - &statuschange($ENV{'form.markdel'},'deleted'); - &disall($r); + &statuschange($ENV{'form.markdel'},'deleted',$folder); + &disall($r,$folder); + } elsif ($ENV{'form.markedmove'}) { + my $total=0; + foreach (keys %ENV) { + if ($_=~/^form\.delmark_(.*)$/) { + &movemsg(&Apache::lonnet::unescape($1),$folder, + $ENV{'form.movetofolder'}); + $total++; + } + } + &printheader($r,'','Moved Messages'); + $r->print('Moved '.$total.' message(s)

'); + &disall($r,$folder); } elsif ($ENV{'form.markeddel'}) { my $total=0; foreach (keys %ENV) { if ($_=~/^form\.delmark_(.*)$/) { - &statuschange(&Apache::lonnet::unescape($1),'deleted'); + &statuschange(&Apache::lonnet::unescape($1),'deleted',$folder); $total++; } } &printheader($r,'','Deleted Messages'); $r->print('Deleted '.$total.' message(s)

'); - &disall($r); + &disall($r,$folder); } elsif ($ENV{'form.markunread'}) { &printheader($r,'','Marked Message as Unread'); &statuschange($ENV{'form.markunread'},'new'); - &disall($r); + &disall($r,$folder); } elsif ($ENV{'form.compose'}) { &compout($r,'','',$ENV{'form.compose'}); } elsif ($ENV{'form.recordftf'}) { @@ -1654,6 +1798,12 @@ sub handler { $ENV{'form.message'}.="\n\n-- Forwarded message --\n\n". $content{'message'}; } + if ($ENV{'form.replyid'}) { + my $msgid=$ENV{'form.replyid'}; + my %message=&Apache::lonnet::get('nohist_email',[$msgid]); + %content=&unpackagemsg($message{$msgid},1); + &statuschange($msgid,'replied'); + } my %toaddr=(); undef %toaddr; if ($ENV{'form.sendmode'} eq 'group') { @@ -1725,9 +1875,13 @@ sub handler { &mt('Please use the browser "Back" button and correct the recipient addresses') ); } + } elsif ($ENV{'form.newfolder'}) { + &printheader($r,'','New Folder'); + &makefolder($ENV{'form.newfolder'}); + &disall($r,$ENV{'form.newfolder'}); } else { &printheader($r,'','Display All Messages'); - &disall($r); + &disall($r,$folder); } $r->print(''); return OK;