--- loncom/interface/lonmsg.pm 2004/11/15 21:28:58 1.118
+++ loncom/interface/lonmsg.pm 2004/12/11 14:09:46 1.122
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines for messaging
#
-# $Id: lonmsg.pm,v 1.118 2004/11/15 21:28:58 www Exp $
+# $Id: lonmsg.pm,v 1.122 2004/12/11 14:09:46 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -531,6 +531,7 @@ sub folderlist {
&Apache::loncommon::select_form($interdis,'interdis',
(' 10' => '10', ' 20' => '20', ' 50' => '50', '100' => '100', '200' => '200')).
'
'.
+ ''.
($folder=~/^(new|critical)/?'':'');
}
@@ -1005,6 +1006,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',
@@ -1056,7 +1058,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.='';
@@ -1070,7 +1072,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.='';
@@ -1084,7 +1086,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').'
';
}
}
}
@@ -1820,10 +1825,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('
'); + &Apache::loncommunicate::menu($r); &disall($r,$folder); } elsif ($ENV{'form.markeddel'}) { my $total=0; @@ -2033,10 +2082,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'}); @@ -2045,13 +2096,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('');