--- loncom/interface/lonmsg.pm	2003/12/30 22:45:59	1.76
+++ loncom/interface/lonmsg.pm	2004/03/01 01:06:10	1.86
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging
 #
-# $Id: lonmsg.pm,v 1.76 2003/12/30 22:45:59 www Exp $
+# $Id: lonmsg.pm,v 1.86 2004/03/01 01:06:10 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>'.
@@ -294,6 +295,14 @@ sub retrieve_author_res_msg {
 sub del_url_author_res_msg {
     my $url=shift;
     $url=&Apache::lonnet::declutter($url);
+    my ($domain,$author)=($url=~/^(\w+)\/(\w+)\//);
+    my @delmsgs=();
+    foreach (&Apache::lonnet::getkeys('nohist_res_msgs',$domain,$author)) {
+	if ($_=~/^\Q$url\E\_\d+$/) {
+	    push (@delmsgs,$_);
+	}
+    }
+    return &Apache::lonnet::del('nohist_res_msgs',\@delmsgs,$domain,$author);
 }
 
 # ================= Return hash with URLs for which there is a resource message
@@ -388,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').' '.
@@ -591,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').'">';
@@ -857,6 +868,7 @@ ENDCOMP
     } else { # $broadcast is 'upload'
 	$r->print(<<ENDUPLOAD);
 <input type=hidden name=sendmode value=upload>
+<input type="hidden" name="send" value="on" />
 <h3>Generate messages from a file</h3>
 <p>
 Subject: <input type=text size=50 name=subject>
@@ -1016,7 +1028,9 @@ sub handler {
   if (!$ENV{'form.display'}) {
       $r->print('<html><head><title>EMail and Messaging</title>'.
 		&Apache::loncommon::studentbrowser_javascript().'</head>'.
-		&Apache::loncommon::bodytag('EMail and Messages'));
+		&Apache::loncommon::bodytag('EMail and Messages').
+	     &Apache::loncommon::help_open_faq(12).
+	     &Apache::loncommon::help_open_bug('Communication Tools'));
   }
   if ($ENV{'form.display'}) {
       my $msgid=$ENV{'form.display'};
@@ -1043,15 +1057,21 @@ sub handler {
       }
       $r->print(&Apache::loncommon::studentbrowser_javascript().
 		'</head>'.
-		&Apache::loncommon::bodytag('EMail and Messages'));
-      $r->print('<b>'.&mt('Subject').':</b> '.$content{'subject'}.
-             '<br><b>'.&mt('From').':</b> '.
+		&Apache::loncommon::bodytag('EMail and Messages').
+	     &Apache::loncommon::help_open_faq(12).
+	     &Apache::loncommon::help_open_bug('Communication Tools'));
+      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>'.
@@ -1072,7 +1092,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'});
@@ -1201,6 +1221,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 {
