--- loncom/interface/lonmsg.pm 2004/01/15 15:12:31 1.79 +++ loncom/interface/lonmsg.pm 2004/01/31 01:21:35 1.82 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Routines for messaging # -# $Id: lonmsg.pm,v 1.79 2004/01/15 15:12:31 www Exp $ +# $Id: lonmsg.pm,v 1.82 2004/01/31 01:21:35 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -274,18 +274,13 @@ sub author_res_msg { sub retrieve_author_res_msg { my $url=shift; $url=&Apache::lonnet::declutter($url); - my ($domain,$author,$file)=($url=~/^(\w+)\/(\w+)\/(.+)$/); - my $listall=($file eq 'allbombs'); + my ($domain,$author)=($url=~/^(\w+)\/(\w+)\//); my %errormsgs=&Apache::lonnet::dump('nohist_res_msgs',$domain,$author); my $msgs=''; foreach (keys %errormsgs) { - if (($_=~/^\Q$url\E\_\d+$/) || ($listall)) { - my ($errurl)=($_=~/^(.+)\_(\d+)$/); + if ($_=~/^\Q$url\E\_\d+$/) { my %content=&unpackagemsg($errormsgs{$_}); $msgs.='

'. - ($listall?"". - $errurl. - ' ':' '). $content{'time'}.': '.$content{'message'}. '

'; } @@ -401,7 +396,7 @@ sub user_crit_received { my %contents=&unpackagemsg($message{$msgid},1); my $status='rec: '.($contents{'sendback'}? &user_normal_msg($contents{'sendername'},$contents{'senderdomain'}, - &mt('Receipt').': '.$ENV{'user.name'}.' at '.$ENV{'user.domain'}, + &mt('Receipt').': '.$ENV{'user.name'}.' '.&mt('at').' '.$ENV{'user.domain'}.', '.$contents{'subject'}, &mt('User').' '.$ENV{'user.name'}.' '.&mt('at').' '.$ENV{'user.domain'}. ' acknowledged receipt of message'."\n".' "'. $contents{'subject'}.'"'."\n".&mt('dated').' '. @@ -1089,7 +1084,7 @@ $content{'sendername'},$content{'senderd '">'.&mt('Next').''); } $r->print('

'.
-             &Apache::lontexconvert::msgtexconverted($content{'message'}).
+             &Apache::lontexconvert::msgtexconverted($content{'message'},1).
              '

'.$content{'citation'}); } elsif ($ENV{'form.replyto'}) { &comprep($r,$ENV{'form.replyto'});