--- loncom/interface/lonmsg.pm	2002/05/07 15:24:34	1.32
+++ loncom/interface/lonmsg.pm	2002/08/28 14:11:27	1.37
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging
 #
-# $Id: lonmsg.pm,v 1.32 2002/05/07 15:24:34 matthew Exp $
+# $Id: lonmsg.pm,v 1.37 2002/08/28 14:11:27 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -49,6 +49,8 @@ use Apache::lonnet();
 use vars qw($msgcount);
 use HTML::TokeParser;
 use Apache::Constants qw(:common);
+use Apache::loncommon;
+use Apache::lontexconvert;
 
 # ===================================================================== Package
 
@@ -312,9 +314,15 @@ sub discrit {
         my %content=&unpackagemsg($what{$_});
         next if ($content{'senderdomain'} eq '');
         $content{'message'}=~s/\n/\<br\>/g;
-        $result.='<hr>From: <b>'.$content{'sendername'}.'@'.
-            $content{'senderdomain'}.'</b> ('.$content{'time'}.
-            ')<br><blockquote>'.$content{'message'}.'</blockquote>'.
+        $result.='<hr>From: <b>'.
+&Apache::loncommon::aboutmewrapper(
+ &Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),$content{'sendername'},$content{'senderdomain'}).'</b> ('.
+$content{'sendername'}.'@'.
+            $content{'senderdomain'}.') '.$content{'time'}.
+            '<br>Subject: '.$content{'subject'}.
+            '<br><blockquote>'.
+              &Apache::lontexconvert::msgtexconverted($content{'message'}).
+            '</blockquote>'.
             '<input type=submit name="rec_'.$_.'" value="Confirm Receipt">'.
             '<input type=submit name="reprec_'.$_.'" '.
                   'value="Confirm Receipt and Reply">';
@@ -342,16 +350,18 @@ sub comprep {
       my $subject='Re: '.$content{'subject'};
       my $dispcrit='';
       if (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) {
+	 my $crithelp = Apache::loncommon::help_open_topic("Course_Critical_Message");
          $dispcrit=
- '<input type=checkbox name=critmsg> Send as critical message<br>'.
- '<input type=checkbox name=sendbck> Send as critical message'.
- ' and return receipt<p>';
+ '<input type=checkbox name=critmsg> Send as critical message ' . $crithelp . 
+ '<br>'.
+ '<input type=checkbox name=sendbck> Send as critical message ' .
+ ' and return receipt' . $crithelp . '<p>';
       }
       $r->print(<<"ENDREPLY");
 <form action="/adm/email" method=post>
 <input type=hidden name=sendreply value="$msgid">
 Subject: <input type=text size=50 name=subject value="$subject"><p>
-<textarea name=message cols=64 rows=10 wrap=hard>
+<textarea name=message cols=84 rows=10 wrap=hard>
 $quotemsg
 </textarea><p>
 $dispcrit
@@ -396,7 +406,7 @@ ENDDISHEADER
                                         $ENV{'user.home'}))) {
         my ($sendtime,$shortsubj,$fromname,$fromdomain,$status)=
 	    &Apache::lonmsg::unpackmsgid($_);
-       unless ($status eq 'deleted') {
+       unless (($status eq 'deleted') || ($sendtime=~/error/)) {
         if ($status eq 'new') {
 	    $r->print('<tr bgcolor="#FFBB77">');
         } elsif ($status eq 'read') {
@@ -431,10 +441,12 @@ sub compout {
     my $dismsg='';
     my $func='Send New';
       if (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) {
+	 my $crithelp = Apache::loncommon::help_open_topic("Course_Critical_Message");
          $dispcrit=
- '<input type=checkbox name=critmsg> Send as critical message<br>'.
- '<input type=checkbox name=sendbck> Send as critical message'.
- ' and return receipt<p>';
+ '<input type=checkbox name=critmsg> Send as critical message ' . $crithelp . 
+ '<br>'.
+ '<input type=checkbox name=sendbck> Send as critical message ' .
+ ' and return receipt' . $crithelp . '<p>';
       }
     if ($forwarding) {
        $dispcrit.='<input type=hidden name=forwid value="'.
@@ -448,6 +460,7 @@ sub compout {
 	   $content{'sendername'}.' at '.$content{'senderdomain'};
     }
     my $defdom=$ENV{'user.domain'};
+    if ($ENV{'form.recdom'}) { $defdom=$ENV{'form.recdom'}; }
       $r->print(
                 '<form action="/adm/email"  name="compemail" method="post"'.
                 ' enctype="multipart/form-data">'."\n".
@@ -458,7 +471,7 @@ sub compout {
 
        $r->print(<<"ENDREC");
 <table>
-<tr><td>Username:</td><td><input type=text size=12 name=recuname></td></tr>
+<tr><td>Username:</td><td><input type=text size=12 name=recuname value="$ENV{'form.recname'}"></td></tr>
 <tr><td>Domain:</td>
 <td>$domform</td></tr>
 ENDREC
@@ -470,7 +483,7 @@ ENDREC
 <input type=text size=50 name=additionalrec></td></tr>
 <tr><td>Subject:</td><td><input type=text size=50 name=subject value="$dissub">
 </td></tr></table>
-<textarea name=message cols=60 rows=10 wrap=hard>$dismsg
+<textarea name=message cols=80 rows=10 wrap=hard>$dismsg
 </textarea><p>
 $dispcrit
 <input type=submit value="$func Mail">
@@ -523,22 +536,24 @@ sub handler {
 # --------------------------- Get query string for limited number of parameters
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
         ['display','replyto','forward','markread','markdel','markunread',
-         'sendreply','compose','sendmail','critical']);
+         'sendreply','compose','sendmail','critical','recname','recdom']);
 
 # --------------------------------------------------------------- Render Output
   
-  $r->print('<html><head><title>EMail and Messaging</title></head>');
-  $r->print(
-   '<body bgcolor="#FFFFFF"><img align=right src=/adm/lonIcons/lonlogos.gif>');
-  $r->print('<h1>EMail</h1>');
+  $r->print('<html><head><title>EMail and Messaging</title></head>'.
+            &Apache::loncommon::bodytag('EMail and Messages'));
   if ($ENV{'form.display'}) {
       my $msgid=$ENV{'form.display'};
       &statuschange($msgid,'read');
       my %message=&Apache::lonnet::get('nohist_email',[$msgid]);
       my %content=&unpackagemsg($message{$msgid});
       $r->print('<b>Subject:</b> '.$content{'subject'}.
-             '<br><b>From:</b> '.$content{'sendername'}.' at '.
-                                 $content{'senderdomain'}.
+             '<br><b>From:</b> '.
+&Apache::loncommon::aboutmewrapper(
+&Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),
+$content{'sendername'},$content{'senderdomain'}).' ('.
+                                 $content{'sendername'}.' at '.
+                                 $content{'senderdomain'}.') '.
              '<br><b>Time:</b> '.$content{'time'}.'<p>'.
              '<table border=2><tr bgcolor="#FFFFAA"><td>Functions:</td>'.
            '<td><a href="/adm/email?replyto='.&Apache::lonnet::escape($msgid).
@@ -549,7 +564,8 @@ sub handler {
              '"><b>Mark Unread</b></a></td>'.
         '<td><a href="/adm/email"><b>Display all Messages</b></a></td>'.
              '</tr></table><p><pre>'.
-             $content{'message'}.'</pre><hr>'.$content{'citation'});
+             &Apache::lontexconvert::msgtexconverted($content{'message'}).
+             '</pre><hr>'.$content{'citation'});
   } elsif ($ENV{'form.replyto'}) {
       &comprep($r,$ENV{'form.replyto'});
   } elsif ($ENV{'form.sendreply'}) {