--- loncom/interface/lonmsg.pm	2004/01/15 15:12:31	1.79
+++ loncom/interface/lonmsg.pm	2004/02/02 22:27:08	1.85
@@ -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.85 2004/02/02 22:27:08 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -139,6 +139,7 @@ sub packagemsg {
            '<browsermathml>'.$ENV{'browser.mathml'}.'</browsermathml>'.
 	   '<browserraw>'.$ENV{'HTTP_USER_AGENT'}.'</browserraw>'.
 	   '<courseid>'.$ENV{'request.course.id'}.'</courseid>'.
+	   '<coursesec>'.$ENV{'request.course.sec'}.'</coursesec>'.
 	   '<role>'.$ENV{'request.role'}.'</role>'.
 	   '<resource>'.$ENV{'request.filename'}.'</resource>'.
            '<msgid>'.$msgid.'</msgid>'.
@@ -274,18 +275,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.='<p><img src="/adm/lonMisc/bomb.gif" /><b>'.
-		($listall?"<a href='".&Apache::lonnet::clutter($errurl)."'><tt>".
-		 $errurl.
-		 '</tt></a> ':' ').
 		$content{'time'}.'</b>: '.$content{'message'}.
 		'<br /></p>';
 	}
@@ -401,7 +397,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').' '.
@@ -604,7 +600,9 @@ $content{'sendername'}.'@'.
             '<br>'.&mt('Subject').': '.$content{'subject'}.
             '<br><blockquote>'.
               &Apache::lontexconvert::msgtexconverted($content{'message'}).
-            '</blockquote>'.
+            '</blockquote><small>'.
+&mt('You have to confirm that you received this message. After confirmation, this message will be moved to your regular inbox').
+            '</small><br />'.
             '<input type=submit name="rec_'.$_.'" value="'.&mt('Confirm Receipt').'">'.
             '<input type=submit name="reprec_'.$_.'" '.
                   'value="'.&mt('Confirm Receipt and Reply').'">';
@@ -1061,14 +1059,18 @@ sub handler {
 		&Apache::loncommon::bodytag('EMail and Messages').
 	     &Apache::loncommon::help_open_faq(12).
 	     &Apache::loncommon::help_open_bug('Communication Tools'));
-      $r->print('<b>'.&mt('Subject').':</b> '.$content{'subject'}.
-             '<br><b>'.&mt('From').':</b> '.
+      my %courseinfo=&Apache::lonnet::coursedescription($content{'courseid'});
+
+      $r->print('<br /><b>'.&mt('Subject').':</b> '.$content{'subject'}.
+             '<br /><b>'.&mt('From').':</b> '.
 &Apache::loncommon::aboutmewrapper(
 &Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),
 $content{'sendername'},$content{'senderdomain'}).' ('.
                                  $content{'sendername'}.' at '.
                                  $content{'senderdomain'}.') '.
-             '<br><b>'.&mt('Time').':</b> '.$content{'time'}.'<p>'.
+	     ($content{'courseid'}?'<br /><b>'.&mt('Course').':</b> '.$courseinfo{'description'}.
+($content{'coursesec'}?' ('.&mt('Group/Section').': '.$content{'coursesec'}.')':''):'').
+             '<br /><b>'.&mt('Time').':</b> '.$content{'time'}.'<p>'.
              '<table border=2><tr bgcolor="#FFFFAA"><td>'.&mt('Functions').':</td>'.
            '<td><a href="/adm/email?replyto='.&Apache::lonnet::escape($msgid).$sqs.
              '"><b>'.&mt('Reply').'</b></a></td>'.
@@ -1089,7 +1091,7 @@ $content{'sendername'},$content{'senderd
            '"><b>'.&mt('Next').'</b></a></td>');
        }
        $r->print('</tr></table><p><pre>'.
-             &Apache::lontexconvert::msgtexconverted($content{'message'}).
+             &Apache::lontexconvert::msgtexconverted($content{'message'},1).
              '</pre><hr>'.$content{'citation'});
   } elsif ($ENV{'form.replyto'}) {
       &comprep($r,$ENV{'form.replyto'});
@@ -1218,6 +1220,7 @@ $content{'sendername'},$content{'senderd
 	  }
       }
       if ($sendstatus=~/^(\s*(?:ok|con_delayed)\s*)*$/) {
+	  $r->print('<br /><font color="green">'.&mt('Completed.').'</font>');
 	  if ($ENV{'form.displayedcrit'}) {
 	      &discrit($r);
 	  } else {