--- loncom/interface/lonmsgdisplay.pm 2007/04/22 02:25:36 1.69 +++ loncom/interface/lonmsgdisplay.pm 2007/05/02 01:33:49 1.72 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Routines for messaging display # -# $Id: lonmsgdisplay.pm,v 1.69 2007/04/22 02:25:36 raeburn Exp $ +# $Id: lonmsgdisplay.pm,v 1.72 2007/05/02 01:33:49 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -1186,7 +1186,13 @@ sub compout { text=>"Display All Messages"}); &printheader($r,'/adm/email?compose=multiforward', 'Forwarding Multiple Messages'); - $r->print(&mt('Each of the [quant,_1,message] you checked will be forwarded to the recipient(s) you select below.',$multiforward).'
'); + if ($multiforward > 1) { + $r->print(&mt('Each of the [quant,_1,message] you checked +will be forwarded to the recipient(s) you select below.',$multiforward).'
'); + } else { + $r->print(&mt('The message you checked will be forwarded to the recipient(s) you select below.').'
'); + } + } else { &printheader($r,'/adm/email?compose=upload', 'Distribute from Uploaded File'); @@ -1222,7 +1228,19 @@ sub compout { &mt('Send copy to permanent email address (if known)').'

'. '

'; - } + } + if ($broadcast ne 'group') { + if (&Apache::lonnet::allowed('dff',$env{'request.course.id'}) || + &Apache::lonnet::allowed('dff',$env{'request.course.id'}. + '/'.$env{'request.course.sec'})) { + + $dispcrit.='

'; + } + } + my %message; my %content; my $defdom=$env{'user.domain'}; @@ -1255,7 +1273,7 @@ sub compout { if ($content{'baseurl'}) { $disbase=''; if ($env{'user.adv'}) { - $disbase.='