--- loncom/interface/lonmsg.pm	2002/03/18 18:38:04	1.29
+++ loncom/interface/lonmsg.pm	2002/07/29 22:17:05	1.36
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging
 #
-# $Id: lonmsg.pm,v 1.29 2002/03/18 18:38:04 www Exp $
+# $Id: lonmsg.pm,v 1.36 2002/07/29 22:17:05 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
 
@@ -303,21 +305,33 @@ ENDDISHEADER
 
 sub discrit {
     my $r=shift;
-      $r->print('<h1><font color=red>Critical Messages</font></h1>'.
-         '<form action=/adm/email method=post>'.
-         '<input type=hidden name=confirm value=true>');
-      my %what=&Apache::lonnet::dump('critical');
-      foreach (sort keys %what) {
-          my %content=&unpackagemsg($what{$_});
-          $content{'message'}=~s/\n/\<br\>/g;
-	  $r->print('<hr>From: <b>'.$content{'sendername'}.'@'.
-                    $content{'senderdomain'}.'</b> ('.$content{'time'}.
-                    ')<br><blockquote>'.$content{'message'}.'</blockquote>'.
-  '<input type=submit name="rec_'.$_.'" value="Confirm Receipt">'.
- '<input type=submit name="reprec_'.$_.'" value="Confirm Receipt and Reply">');
-      }
-      $r->print(
-          '<input type=hidden name="displayedcrit" value="true"></form>');
+    my $header = '<h1><font color=red>Critical Messages</font></h1>'.
+        '<form action=/adm/email method=post>'.
+        '<input type=hidden name=confirm value=true>';
+    my %what=&Apache::lonnet::dump('critical');
+    my $result = '';
+    foreach (sort keys %what) {
+        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>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">';
+    }
+    # Check to see if there were any messages.
+    if ($result eq '') {
+        $result = "<h2>You have no critical messages.</h2>";
+    } else {
+        $r->print($header);
+    }
+    $r->print($result);
+    $r->print('<input type=hidden name="displayedcrit" value="true"></form>');
 }
 
 # =============================================================== Compose reply
@@ -333,10 +347,12 @@ 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>
@@ -387,7 +403,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') {
@@ -422,10 +438,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="'.
@@ -440,18 +458,21 @@ sub compout {
     }
     my $defdom=$ENV{'user.domain'};
       $r->print(
-                '<form action="/adm/email"  name="compemail" method=post'.
-                ' enctype="multipart/form-data">'.
-                '<input type=hidden name=sendmail value=on><table>');
+                '<form action="/adm/email"  name="compemail" method="post"'.
+                ' enctype="multipart/form-data">'."\n".
+                '<input type="hidden" name="sendmail" value="on">'."\n".
+                '<table>');
     unless (($broadcast eq 'group') || ($broadcast eq 'upload')) {
+        my $domform = &Apache::loncommon::select_dom_form($defdom,'recdomain');
+
        $r->print(<<"ENDREC");
 <table>
 <tr><td>Username:</td><td><input type=text size=12 name=recuname></td></tr>
 <tr><td>Domain:</td>
-<td><input type=text size=12 name=recdomain value="$defdom"></td></tr>
+<td>$domform</td></tr>
 ENDREC
     }
-    unless ($broadcast eq 'upload') {
+    if ($broadcast ne 'upload') {
        $r->print(<<"ENDCOMP");
 <tr><td>Additional Recipients<br><tt>username\@domain,username\@domain, ...
 </tt></td><td>
@@ -463,23 +484,29 @@ ENDREC
 $dispcrit
 <input type=submit value="$func Mail">
 ENDCOMP
-    }
-    if ($broadcast eq 'upload') {
+    } else { # $broadcast is 'upload'
 	$r->print(<<ENDUPLOAD);
 <input type=hidden name=sendmode value=upload>
 <h3>Generate messages from a file</h3>
+<p>
 Subject: <input type=text size=50 name=subject>
+</p>
+<p>General message text<br />
+<textarea name=message cols=60 rows=10 wrap=hard>$dismsg
+</textarea></p>
+<p>
+The file format for the uploaded portion of the message is:
 <pre>
 username1\@domain1: text
 username2\@domain2: text
-username1\@domain1: text
+username3\@domain1: text
 </pre>
+</p>
+<p>
 The messages will be assembled from all lines with the respective 
-<tt>username\@domain</tt>, and appended to the general message text.<p>
+<tt>username\@domain</tt>, and appended to the general message text.</p>
+<p>
 <input type=file name=upfile size=20><p>
-General message text:<p>
-<textarea name=message cols=60 rows=10 wrap=hard>$dismsg
-</textarea><p>
 $dispcrit
 <input type=submit value="Upload and send">
 ENDUPLOAD
@@ -503,21 +530,9 @@ sub handler {
   return OK if $r->header_only;
 
 # --------------------------- Get query string for limited number of parameters
-
-    foreach (split(/&/,$ENV{'QUERY_STRING'})) {
-       my ($name, $value) = split(/=/,$_);
-       $value =~ tr/+/ /;
-       $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg;
-       if (($name eq 'display') || ($name eq 'replyto') || 
-           ($name eq 'forward') || ($name eq 'markread') ||
-           ($name eq 'markdel') || ($name eq 'markunread') ||
-           ($name eq 'sendreply') || ($name eq 'compose') ||
-           ($name eq 'sendmail') || ($name eq 'critical')) {
-           unless ($ENV{'form.'.$name}) {
-              $ENV{'form.'.$name}=$value;
-	   }
-       }
-    }
+    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+        ['display','replyto','forward','markread','markdel','markunread',
+         'sendreply','compose','sendmail','critical']);
 
 # --------------------------------------------------------------- Render Output
   
@@ -543,7 +558,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'}) {