--- loncom/interface/lonmsgdisplay.pm 2007/01/17 18:05:57 1.64
+++ loncom/interface/lonmsgdisplay.pm 2007/02/28 16:30:40 1.67
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines for messaging display
#
-# $Id: lonmsgdisplay.pm,v 1.64 2007/01/17 18:05:57 raeburn Exp $
+# $Id: lonmsgdisplay.pm,v 1.67 2007/02/28 16:30:40 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -119,6 +119,7 @@ use Apache::lonnet;
use HTML::TokeParser();
use Apache::Constants qw(:common);
use Apache::loncommon();
+use Apache::lonhtmlcommon();
use Apache::lontexconvert();
use HTML::Entities();
use Apache::lonlocal;
@@ -980,6 +981,10 @@ ENDDISHEADER
} else {
$r->print('
'.&mt('There are no '.lc($statushash{$msgstatus}).' messages in this folder.').'
');
}
+ if ($numblocked > 0) {
+ $r->print(&blocked_in_folder($numblocked,$startblock,$endblock,
+ \%setters));
+ }
return;
}
my $interdis = $env{'form.interdis'};
@@ -1136,15 +1141,22 @@ ENDDISHEADER
my $postedstartdis=$startdis+1;
$r->print('');
if ($numblocked > 0) {
- my $beginblock = &Apache::lonlocal::locallocaltime($startblock);
- my $finishblock = &Apache::lonlocal::locallocaltime($endblock);
- $r->print('
'.
- &mt('[quant,_1,message is, messages are] not viewable because display of LON-CAPA messages sent to you by other students between [_2] and [_3] is currently being blocked because of online exams.',$numblocked,$beginblock,$finishblock));
- $r->print(&Apache::loncommon::build_block_table($startblock,$endblock,
- \%setters));
+ $r->print(&blocked_in_folder($numblocked,$startblock,$endblock,
+ \%setters));
}
}
+sub blocked_in_folder {
+ my ($numblocked,$startblock,$endblock,$setters) = @_;
+ my $beginblock = &Apache::lonlocal::locallocaltime($startblock);
+ my $finishblock = &Apache::lonlocal::locallocaltime($endblock);
+ my $output = '
'.
+ &mt('[quant,_1,message is, messages are] not viewable because display of LON-CAPA messages sent to you by other students between [_2] and [_3] is currently being blocked because of online exams.',$numblocked,$beginblock,$finishblock);
+ $output .= &Apache::loncommon::build_block_table($startblock,$endblock,
+ $setters);
+ return $output;
+}
+
# ============================================================== Compose output
sub compout {
@@ -2028,6 +2040,7 @@ sub displaymessage {
if (defined($content{'baseurl'})) {
$baseurl = &Apache::lonenc::check_encrypt($content{'baseurl'});
}
+ $r->print(&Apache::loncommon::studentimagetag($content{'senderdomain'},$content{'sendername'}));
$r->print(' '.&mt('Subject').': '.$content{'subject'}.
($folder ne 'sent'?' '.&mt('From').': '.
&Apache::loncommon::aboutmewrapper(
@@ -2269,7 +2282,7 @@ sub sendoffmail {
}
}
if ($env{'form.additionalrec'}) {
- foreach my $rec (split(/\,/,$env{'form.additionalrec'})) {
+ foreach my $rec (split(/\s*,\s*/,$env{'form.additionalrec'})) {
my ($auname,$audom)=split(/:/,$rec);
if (($auname ne "") && ($audom ne "")) {
$toaddr{$auname.':'.$audom}='';
@@ -2716,6 +2729,7 @@ sub handler {
my $delresult = &deletefolder($folder);
if ($delresult eq 'ok') {
$r->print(&mt('Mail folder "[_1]" deleted.',$folder).' ');
+ $env{'form.folder'} = '';
} else {
$r->print(&mt('Deletion failed.').' '.$delresult.' ');
$showfolder = $folder;