--- loncom/interface/lonmsg.pm 2004/11/11 20:41:53 1.114 +++ loncom/interface/lonmsg.pm 2005/01/01 18:24:12 1.127 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Routines for messaging # -# $Id: lonmsg.pm,v 1.114 2004/11/11 20:41:53 www Exp $ +# $Id: lonmsg.pm,v 1.127 2005/01/01 18:24:12 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -527,17 +527,27 @@ sub folderlist { 'critical' => &mt('Critical'), '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('Show'). + ''. '
'. - ($folder!~/^(new|critical)/? + ''. + ($folder=~/^(new|critical)/?'':''); +} + +sub scrollbuttons { + my ($start,$maxdis,$first,$finish,$total)=@_; + unless ($total>0) { return ''; } + $start++; $maxdis++;$first++;$finish++; + return ''. ''. - ''. + ' of '.$maxdis. ''. - '':''). - ''; + '
'. + &mt('Messages [_1] through [_2] of [_3]',$first,$finish,$total).''; } # =============================================================== Folder suffix @@ -580,7 +590,6 @@ sub makefolder { sub movemsg { my ($msgid,$srcfolder,$trgfolder)=@_; - my $unmsgid=&Apache::lonnet::unescape($msgid); my $srcsuffix=&foldersuffix($srcfolder); my $trgsuffix=&foldersuffix($trgfolder); @@ -589,16 +598,16 @@ sub movemsg { &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}}); + my %status=&Apache::lonnet::get('email_status'.$srcsuffix,[$msgid]); + &Apache::lonnet::put('email_status'.$trgsuffix,{$msgid => $status{$msgid}}); # See if was deleted -> becomes "read" in trash - my $currentstatus=(&unpackmsgid($status{$unmsgid}),$srcfolder); + my $currentstatus=(&unpackmsgid($status{$msgid}),$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]); + &Apache::lonnet::del('email_status'.$srcsuffix,[$msgid]); } # ======================================================= Display a course list @@ -691,7 +700,6 @@ sub discrit { foreach (sort keys %what) { my %content=&unpackagemsg($what{$_}); next if ($content{'senderdomain'} eq ''); - $content{'message'}=~s/\n/\/g; $result.='
'.&mt('From').': '. &Apache::loncommon::aboutmewrapper( &Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),$content{'sendername'},$content{'senderdomain'}).' ('. @@ -907,11 +915,20 @@ ENDDISHEADER my $fsqs='&folder='.$folder; my @temp=sortedmessages(\%blocked,$startblock,$endblock,\$numblocked,$folder); my $totalnumber=$#temp+1; - my $number=int($totalnumber/$interdis)+1; + unless ($totalnumber>0) { + $r->print('

'.&mt('Empty Folder').'

'); + return; + } + unless ($interdis) { + $interdis=20; + } + my $number=int($totalnumber/$interdis); + if (($startdis<0) || ($startdis>$number)) { $startdis=$number; } my $firstdis=$interdis*$startdis; if ($firstdis>$#temp) { $firstdis=$#temp-$interdis+1; } my $lastdis=$firstdis+$interdis-1; if ($lastdis>$#temp) { $lastdis=$#temp; } + $r->print(&scrollbuttons($startdis,$number,$firstdis,$lastdis,$totalnumber)); $r->print('
'. ''); } - $r->print(''); + $r->print("\n"); for (my $n=$firstdis;$n<=$lastdis;$n++) { my ($sendtime,$shortsubj,$fromname,$fromdomain,$status,$origID)= @{$temp[$n]}; if (($status ne 'deleted') && defined($sendtime) && $sendtime!~/error/) { @@ -963,13 +980,13 @@ ENDDISHEADER ''); + $status."\n"); } elsif ($status eq 'deleted') { # purge &movemsg(&Apache::lonnet::unescape($origID),$folder,'trash'); } } - $r->print('
 '); if ($ENV{'form.sortedby'} eq "revdate") { @@ -943,7 +960,7 @@ ENDDISHEADER } else { $r->print(''.&mt('Status').'
'.&Apache::lonlocal::locallocaltime($sendtime).''. $fromname.''.$fromdomain.''. &Apache::lonnet::unescape($shortsubj).''. - $status.'

'. + $r->print("\n

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

'. ''); @@ -977,14 +994,15 @@ ENDDISHEADER $r->print( '

'); } -$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('

'); + my $postedstartdis=$startdis+1; + $r->print(''); if ($numblocked > 0) { my $beginblock = &Apache::lonlocal::locallocaltime($startblock); my $finishblock = &Apache::lonlocal::locallocaltime($endblock); @@ -998,6 +1016,7 @@ $r->print('

'Username', 'do' => 'Domain', @@ -1048,7 +1068,7 @@ sub compout { my %content; my $defdom=$ENV{'user.domain'}; if ($forwarding) { - %message=&Apache::lonnet::get('nohist_email',[$forwarding]); + %message=&Apache::lonnet::get('nohist_email'.$suffix,[$forwarding]); %content=&unpackagemsg($message{$forwarding},$folder); $dispcrit.=''; @@ -1057,9 +1077,12 @@ sub compout { $dissub=&mt('Forwarding').': '.$content{'subject'}; $dismsg=&mt('Forwarded message from').' '. $content{'sendername'}.' '.&mt('at').' '.$content{'senderdomain'}; + if ($content{'baseurl'}) { + $disbase=''; + } } if ($replying) { - %message=&Apache::lonnet::get('nohist_email',[$replying]); + %message=&Apache::lonnet::get('nohist_email'.$suffix,[$replying]); %content=&unpackagemsg($message{$replying},$folder); $dispcrit.=''; @@ -1070,6 +1093,15 @@ sub compout { $dismsg=~s/\r/\n/g; $dismsg=~s/\f/\n/g; $dismsg=~s/\n+/\n\> /g; + if ($content{'baseurl'}) { + $disbase=''; + if ($ENV{'user.adv'}) { + $disbase.=''.&mt('Store message for re-use'). + ' '. + &mt('Show re-usable messages').'
'; + } + } } my $citation=&displayresource(%content); if ($ENV{'form.recdom'}) { $defdom=$ENV{'form.recdom'}; } @@ -1111,6 +1143,7 @@ $latexHelp


$dispcrit +$disbase
$citation @@ -1708,9 +1741,8 @@ sub displaymessage { '">'.&mt('Mark Unread').''. 'Delete'. - ''.&mt('Display all Messages').''); + ''.&mt('Back to Folder Display').''); if ($counter > 0){ $r->print(''.&mt('Previous').''); @@ -1735,6 +1767,8 @@ sub displaymessage { ($content{'courseid'}?'
'.&mt('Course').': '.$courseinfo{'description'}. ($content{'coursesec'}?' ('.&mt('Group/Section').': '.$content{'coursesec'}.')':''):''). '
'.&mt('Time').': '.$content{'time'}. + ($content{'baseurl'}?'
'.&mt('Refers to').': '. + $content{'baseurl'}.' ('.&Apache::lonnet::gettitle($content{'baseurl'}).')':''). '

'.
 	      &Apache::lontexconvert::msgtexconverted($content{'message'},1).
 	      '
'.&displayresource(%content).'

'); @@ -1800,6 +1834,143 @@ sub printheader { &header($r,$title,$baseurl); } +# ------------------------------------------------------------ Store the comment + +sub storecomment { + my ($r)=@_; + my $msgtxt=&Apache::lonfeedback::clear_out_html($ENV{'form.message'}); + my $cleanmsgtxt=''; + foreach (split(/[\n\r]/,$msgtxt)) { + unless ($_=~/^\s*(\>|\>\;)/) { + $cleanmsgtxt.=$_."\n"; + } + } + my $key=&Apache::lonnet::escape($ENV{'form.baseurl'}).'___'.time; + &Apache::lonnet::put('nohist_stored_comments',{ $key => $cleanmsgtxt }); +} + +sub storedcommentlisting { + my ($r)=@_; + my %msgs=&Apache::lonnet::dump('nohist_stored_comments',undef,undef, + '^'.&Apache::lonnet::escape(&Apache::lonnet::escape($ENV{'form.showcommentbaseurl'}))); + $r->print(''); + if ((keys %msgs)[0]=~/^error\:/) { + $r->print(&mt('No stored comments yet.')); + } else { + my $found=0; + foreach (sort keys %msgs) { + $r->print("\n".$msgs{$_}."
"); + $found=1; + } + unless ($found) { + $r->print(&mt('No stored comments yet for this resource.')); + } + } +} + +# ---------------------------------------------------------------- Send an email + +sub sendoffmail { + my ($r,$folder)=@_; + my $suffix=&foldersuffix($folder); + my $sendstatus=''; + if ($ENV{'form.send'}) { + &printheader($r,'','Messages being sent.'); + $r->rflush(); + my %content=(); + undef %content; + if ($ENV{'form.forwid'}) { + my $msgid=$ENV{'form.forwid'}; + my %message=&Apache::lonnet::get('nohist_email'.$suffix,[$msgid]); + %content=&unpackagemsg($message{$msgid},1); + &statuschange($msgid,'forwarded',$folder); + $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'.$suffix,[$msgid]); + %content=&unpackagemsg($message{$msgid},1); + &statuschange($msgid,'replied',$folder); + } + my %toaddr=(); + undef %toaddr; + if ($ENV{'form.sendmode'} eq 'group') { + foreach (keys %ENV) { + if ($_=~/^form\.send\_to\_\&\&\&[^\&]*\&\&\&\_(.+)$/) { + $toaddr{$1}=''; + } + } + } elsif ($ENV{'form.sendmode'} eq 'upload') { + foreach (split(/[\n\r\f]+/,$ENV{'form.upfile'})) { + my ($rec,$txt)=split(/\s*\:\s*/,$_); + if ($txt) { + $rec=~s/\@/\:/; + $toaddr{$rec}.=$txt."\n"; + } + } + } else { + $toaddr{$ENV{'form.recuname'}.':'.$ENV{'form.recdomain'}}=''; + } + if ($ENV{'form.additionalrec'}) { + foreach (split(/\,/,$ENV{'form.additionalrec'})) { + my ($auname,$audom)=split(/\@/,$_); + $toaddr{$auname.':'.$audom}=''; + } + } + + foreach (keys %toaddr) { + my ($recuname,$recdomain)=split(/\:/,$_); + my $msgtxt; + if ((($ENV{'form.critmsg'}) || ($ENV{'form.sendbck'})) && + (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}))) { + $msgtxt=&Apache::lonfeedback::clear_out_html($ENV{'form.message'},1); + } else { + $msgtxt=&Apache::lonfeedback::clear_out_html($ENV{'form.message'}); + } + if ($toaddr{$_}) { $msgtxt.='
'.$toaddr{$_}; } + my $thismsg; + if ((($ENV{'form.critmsg'}) || ($ENV{'form.sendbck'})) && + (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}))) { + $r->print(&mt('Sending critical message').' '.$recuname.'@'.$recdomain.': '); + $thismsg=&user_crit_msg($recuname,$recdomain, + &Apache::lonfeedback::clear_out_html($ENV{'form.subject'}), + $msgtxt, + $ENV{'form.sendbck'}); + } else { + $r->print(&mt('Sending').' '.$recuname.'@'.$recdomain.': '); + $thismsg=&user_normal_msg($recuname,$recdomain, + &Apache::lonfeedback::clear_out_html($ENV{'form.subject'}), + $msgtxt, + $content{'citation'}); + if (($ENV{'request.course.id'}) && ($ENV{'form.sendmode'} eq 'group')) { + &user_normal_msg_raw( + $ENV{'course.'.$ENV{'request.course.id'}.'.num'}, + $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}, + 'Broadcast ['.$recuname.':'.$recdomain.']', + $msgtxt); + } + } + $r->print($thismsg.'
'); + $sendstatus.=' '.$thismsg; + } + } else { + &printheader($r,'','No messages sent.'); + } + if ($sendstatus=~/^(\s*(?:ok|con_delayed)\s*)*$/) { + $r->print('
'.&mt('Completed.').''); + if ($ENV{'form.displayedcrit'}) { + &discrit($r); + } else { + &Apache::loncommunicate::menu($r); + } + } else { + $r->print( + '

'.&mt('Could not deliver message').'

'. + &mt('Please use the browser "Back" button and correct the recipient addresses') + ); + } +} # ===================================================================== Handler @@ -1817,10 +1988,9 @@ sub handler { &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['display','replyto','forward','markread','markdel','markunread', 'sendreply','compose','sendmail','critical','recname','recdom', - 'recordftf','sortedby','block','folder','startdis','interdis']); - $sqs='&sortedby='.$ENV{'form.sortedby'}. - '&startdis='.$ENV{'form.startdis'}. - '&interdis='.$ENV{'form.interdis'}; + 'recordftf','sortedby','block','folder','startdis','interdis', + 'showcommentbaseurl']); + $sqs='&sortedby='.$ENV{'form.sortedby'}; # ------------------------------------------------------ They checked for email unless ($ENV{'form.block'}) { @@ -1841,15 +2011,33 @@ sub handler { unless ($folder) { $folder=''; } else { - $sqs='&folder='.&Apache::lonnet::escape($folder); + $sqs.='&folder='.&Apache::lonnet::escape($folder); } # --------------------------------------------------------------------- Display $startdis=$ENV{'form.startdis'}; + $startdis--; unless ($startdis) { $startdis=0; } + $interdis=$ENV{'form.interdis'}; unless ($interdis) { $interdis=20; } + $sqs.='&interdis='.$interdis; + + if ($ENV{'form.firstview'}) { + $startdis=0; + } + if ($ENV{'form.lastview'}) { + $startdis=-1; + } + if ($ENV{'form.prevview'}) { + $startdis--; + } + if ($ENV{'form.nextview'}) { + $startdis++; + } + my $postedstartdis=$startdis+1; + $sqs.='&startdis='.$postedstartdis; # --------------------------------------------------------------- Render Output @@ -1876,10 +2064,11 @@ sub handler { &printheader($r,'','Displaying Critical Messages'); &discrit($r); } elsif ($ENV{'form.forward'}) { - &compout($r,$ENV{'form.forward'}); + &compout($r,$ENV{'form.forward'},undef,undef,undef,$folder); } elsif ($ENV{'form.markdel'}) { &printheader($r,'','Deleted Message'); &statuschange($ENV{'form.markdel'},'deleted',$folder); + &Apache::loncommunicate::menu($r); &disall($r,$folder); } elsif ($ENV{'form.markedmove'}) { my $total=0; @@ -1892,6 +2081,7 @@ sub handler { } &printheader($r,'','Moved Messages'); $r->print('Moved '.$total.' message(s)

'); + &Apache::loncommunicate::menu($r); &disall($r,$folder); } elsif ($ENV{'form.markeddel'}) { my $total=0; @@ -1903,10 +2093,12 @@ sub handler { } &printheader($r,'','Deleted Messages'); $r->print('Deleted '.$total.' message(s)

'); + &Apache::loncommunicate::menu($r); &disall($r,$folder); } elsif ($ENV{'form.markunread'}) { &printheader($r,'','Marked Message as Unread'); &statuschange($ENV{'form.markunread'},'new'); + &Apache::loncommunicate::menu($r); &disall($r,$folder); } elsif ($ENV{'form.compose'}) { &compout($r,'','',$ENV{'form.compose'}); @@ -1915,103 +2107,21 @@ sub handler { } elsif ($ENV{'form.block'}) { &examblock($r,$ENV{'form.block'}); } elsif ($ENV{'form.sendmail'}) { - my $sendstatus=''; - if ($ENV{'form.send'}) { - &printheader($r,'','Messages being sent.'); - $r->rflush(); - my %content=(); - undef %content; - if ($ENV{'form.forwid'}) { - my $msgid=$ENV{'form.forwid'}; - my %message=&Apache::lonnet::get('nohist_email',[$msgid]); - %content=&unpackagemsg($message{$msgid},1); - &statuschange($msgid,'forwarded'); - $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') { - foreach (keys %ENV) { - if ($_=~/^form\.send\_to\_\&\&\&[^\&]*\&\&\&\_(.+)$/) { - $toaddr{$1}=''; - } - } - } elsif ($ENV{'form.sendmode'} eq 'upload') { - foreach (split(/[\n\r\f]+/,$ENV{'form.upfile'})) { - my ($rec,$txt)=split(/\s*\:\s*/,$_); - if ($txt) { - $rec=~s/\@/\:/; - $toaddr{$rec}.=$txt."\n"; - } - } - } else { - $toaddr{$ENV{'form.recuname'}.':'.$ENV{'form.recdomain'}}=''; - } - if ($ENV{'form.additionalrec'}) { - foreach (split(/\,/,$ENV{'form.additionalrec'})) { - my ($auname,$audom)=split(/\@/,$_); - $toaddr{$auname.':'.$audom}=''; - } - } - - foreach (keys %toaddr) { - my ($recuname,$recdomain)=split(/\:/,$_); - my $msgtxt=&Apache::lonfeedback::clear_out_html($ENV{'form.message'}); - if ($toaddr{$_}) { $msgtxt.='

'.$toaddr{$_}; } - my $thismsg; - if ((($ENV{'form.critmsg'}) || ($ENV{'form.sendbck'})) && - (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}))) { - $r->print(&mt('Sending critical message').' '.$recuname.'@'.$recdomain.': '); - $thismsg=&user_crit_msg($recuname,$recdomain, - &Apache::lonfeedback::clear_out_html($ENV{'form.subject'}), - $msgtxt, - $ENV{'form.sendbck'}); - } else { - $r->print(&mt('Sending').' '.$recuname.'@'.$recdomain.': '); - $thismsg=&user_normal_msg($recuname,$recdomain, - &Apache::lonfeedback::clear_out_html($ENV{'form.subject'}), - $msgtxt, - $content{'citation'}); - if (($ENV{'request.course.id'}) && ($ENV{'form.sendmode'} eq 'group')) { - &user_normal_msg_raw( - $ENV{'course.'.$ENV{'request.course.id'}.'.num'}, - $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}, - 'Broadcast ['.$recuname.':'.$recdomain.']', - $msgtxt); - } - } - $r->print($thismsg.'
'); - $sendstatus.=' '.$thismsg; - } - } else { - &printheader($r,'','No messages sent.'); - } - if ($sendstatus=~/^(\s*(?:ok|con_delayed)\s*)*$/) { - $r->print('
'.&mt('Completed.').''); - if ($ENV{'form.displayedcrit'}) { - &discrit($r); - } else { - &Apache::loncommunicate::menu($r); - } - } else { - $r->print( - '

'.&mt('Could not deliver message').'

'. - &mt('Please use the browser "Back" button and correct the recipient addresses') - ); + &sendoffmail($r,$folder); + if ($ENV{'form.storebasecomment'}) { + &storecomment($r); } + &disall($r,$folder); } elsif ($ENV{'form.newfolder'}) { &printheader($r,'','New Folder'); &makefolder($ENV{'form.newfolder'}); + &Apache::loncommunicate::menu($r); &disall($r,$ENV{'form.newfolder'}); + } elsif ($ENV{'form.showcommentbaseurl'}) { + &storedcommentlisting($r); } else { &printheader($r,'','Display All Messages'); + &Apache::loncommunicate::menu($r); &disall($r,$folder); } $r->print('');