--- loncom/interface/lonmsg.pm 2004/11/17 21:31:37 1.121
+++ 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.121 2004/11/17 21:31:37 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;
@@ -1912,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'})) &&