--- loncom/interface/lonmsgdisplay.pm 2006/06/29 17:50:01 1.35.2.1
+++ loncom/interface/lonmsgdisplay.pm 2006/07/17 16:26:09 1.37
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines for messaging display
#
-# $Id: lonmsgdisplay.pm,v 1.35.2.1 2006/06/29 17:50:01 albertel Exp $
+# $Id: lonmsgdisplay.pm,v 1.37 2006/07/17 16:26:09 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -453,7 +453,7 @@ sub disnew {
my %lt=&Apache::lonlocal::texthash(
'nm' => 'New Messages',
'su' => 'Subject',
- 'co' => 'Course',
+ 'co' => 'Course/Group',
'da' => 'Date',
'us' => 'Username',
'op' => 'Open',
@@ -622,9 +622,9 @@ ENDDISHEADER
}
$r->print('
');
if ($env{'form.sortedby'} eq "revcourse") {
- $r->print(''.&mt('Course').'');
+ $r->print(''.&mt('Course/Group').'');
} else {
- $r->print(''.&mt('Course').'');
+ $r->print(''.&mt('Course/Group').'');
}
$r->print(' | ');
if ($env{'form.sortedby'} eq "revstatus") {
@@ -883,6 +883,9 @@ ENDUPLOAD
my $studentsel = &discourse();
$r->print($studentsel);
}
+ if ($env{'form.displayedcrit'}) {
+ $r->print('');
+ }
$r->print(''.
&Apache::lonfeedback::generate_preview_button('compemail','message').
&Apache::lonhtmlcommon::htmlareaselectactive('message'));
@@ -1379,7 +1382,7 @@ sub build_block_table {
my ($r,$startblock,$endblock,$setters) = @_;
my %lt = &Apache::lonlocal::texthash(
'cacb' => 'Currently active communication blocks',
- 'cour' => 'Course',
+ 'cour' => 'Course/Group',
'dura' => 'Duration',
'blse' => 'Block set by'
);
@@ -1642,7 +1645,7 @@ sub sendoffmail {
}
my @to =
- &Apache::loncommon::get_env_multiple('form.selectedusers.forminput');
+ &Apache::loncommon::get_env_multiple('form.selectedusers_forminput');
my $mode = $env{'form.sendmode'};
my %toaddr;
@@ -1896,6 +1899,7 @@ sub handler {
&compout($r,'',$env{'form.replyto'},undef,undef,$folder,$dismode);
} elsif ($env{'form.confirm'}) {
&printheader($r,'','Confirmed Receipt');
+ my $replying = 0;
foreach (keys %env) {
if ($_=~/^form\.rec\_(.*)$/) {
$r->print(''.&mt('Confirming Receipt').': '.
@@ -1906,9 +1910,12 @@ sub handler {
$r->print(''.&mt('Confirming Receipt').': '.
&Apache::lonmsg::user_crit_received($msgid).' ');
&compout($r,'','','',$msgid);
+ $replying = 1;
}
}
- &discrit($r);
+ if (!$replying) {
+ &discrit($r);
+ }
} elsif ($env{'form.critical'}) {
&printheader($r,'','Displaying Critical Messages');
&discrit($r);
@@ -2002,7 +2009,9 @@ sub handler {
$env{'form.subject'},
$env{'form.message'},'/adm/communicate','public');
}
- &disall($r,($folder?$folder:$dismode));
+ if (!$env{'form.displayedcrit'}) {
+ &disall($r,($folder?$folder:$dismode));
+ }
} elsif ($env{'form.newfolder'}) {
&printheader($r,'','New Folder');
&makefolder($env{'form.newfolder'});
|