--- loncom/interface/lonmsg.pm 2004/11/15 21:37:44 1.119 +++ loncom/interface/lonmsg.pm 2004/12/15 01:17:09 1.124 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Routines for messaging # -# $Id: lonmsg.pm,v 1.119 2004/11/15 21:37:44 www Exp $ +# $Id: lonmsg.pm,v 1.124 2004/12/15 01:17:09 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -537,7 +537,9 @@ sub folderlist { sub scrollbuttons { my ($start,$maxdis,$first,$finish,$total)=@_; + unless ($total>0) { return ''; } $start++; $maxdis++;$first++;$finish++; + return ''. ''. ' of '.$maxdis. @@ -697,7 +699,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'}).' ('. @@ -913,6 +914,10 @@ ENDDISHEADER my $fsqs='&folder='.$folder; my @temp=sortedmessages(\%blocked,$startblock,$endblock,\$numblocked,$folder); my $totalnumber=$#temp+1; + unless ($totalnumber>0) { + $r->print('

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

'); + return; + } my $number=int($totalnumber/$interdis); if (($startdis<0) || ($startdis>$number)) { $startdis=$number; } my $firstdis=$interdis*$startdis; @@ -1006,6 +1011,7 @@ ENDDISHEADER sub compout { my ($r,$forwarding,$replying,$broadcast,$replycrit,$folder)=@_; + my $suffix=&foldersuffix($folder); if ($broadcast eq 'individual') { &printheader($r,'/adm/email?compose=individual', @@ -1057,7 +1063,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.=''; @@ -1071,7 +1077,7 @@ sub compout { } } if ($replying) { - %message=&Apache::lonnet::get('nohist_email',[$replying]); + %message=&Apache::lonnet::get('nohist_email'.$suffix,[$replying]); %content=&unpackagemsg($message{$replying},$folder); $dispcrit.=''; @@ -1085,7 +1091,10 @@ sub compout { if ($content{'baseurl'}) { $disbase=''; if ($ENV{'user.adv'}) { - $disbase=''.&mt('Store message for re-use').'
'; + $disbase.=''.&mt('Store message for re-use'). + ' '. + &mt('Show re-usable messages').'
'; } } } @@ -1821,10 +1830,45 @@ 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)=@_; + my ($r,$folder)=@_; + my $suffix=&foldersuffix($folder); my $sendstatus=''; if ($ENV{'form.send'}) { &printheader($r,'','Messages being sent.'); @@ -1833,17 +1877,17 @@ sub sendoffmail { undef %content; if ($ENV{'form.forwid'}) { my $msgid=$ENV{'form.forwid'}; - my %message=&Apache::lonnet::get('nohist_email',[$msgid]); + my %message=&Apache::lonnet::get('nohist_email'.$suffix,[$msgid]); %content=&unpackagemsg($message{$msgid},1); - &statuschange($msgid,'forwarded'); + &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',[$msgid]); + my %message=&Apache::lonnet::get('nohist_email'.$suffix,[$msgid]); %content=&unpackagemsg($message{$msgid},1); - &statuschange($msgid,'replied'); + &statuschange($msgid,'replied',$folder); } my %toaddr=(); undef %toaddr; @@ -1873,7 +1917,13 @@ sub sendoffmail { foreach (keys %toaddr) { my ($recuname,$recdomain)=split(/\:/,$_); - my $msgtxt=&Apache::lonfeedback::clear_out_html($ENV{'form.message'}); + 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'})) && @@ -1934,7 +1984,8 @@ 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']); + 'recordftf','sortedby','block','folder','startdis','interdis', + 'showcommentbaseurl']); $sqs='&sortedby='.$ENV{'form.sortedby'}. '&startdis='.$ENV{'form.startdis'}. '&interdis='.$ENV{'form.interdis'}; @@ -2007,10 +2058,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; @@ -2023,6 +2075,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; @@ -2034,10 +2087,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'}); @@ -2046,13 +2101,21 @@ sub handler { } elsif ($ENV{'form.block'}) { &examblock($r,$ENV{'form.block'}); } elsif ($ENV{'form.sendmail'}) { - &sendoffmail($r); + &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('');