--- loncom/interface/lonmsg.pm	2001/08/03 17:16:48	1.14
+++ loncom/interface/lonmsg.pm	2001/08/06 11:41:11	1.16
@@ -13,7 +13,7 @@
 # 10/19,10/20,10/30,
 # 02/06/01 Gerd Kortemeyer
 # 07/27 Guy Albertelli
-# 07/27,07/28,07/30,08/03 Gerd Kortemeyer
+# 07/27,07/28,07/30,08/03,08/06 Gerd Kortemeyer
 
 package Apache::lonmsg;
 
@@ -223,7 +223,8 @@ sub discrit {
   '<input type=submit name="rec_'.$_.'" value="Confirm Receipt">'.
  '<input type=submit name="reprec_'.$_.'" value="Confirm Receipt and Reply">');
       } sort keys %what;
-      $r->print('</form>');
+      $r->print(
+          '<input type=hidden name="displayedcrit" value="true"></form>');
 }
 
 # =============================================================== Compose reply
@@ -255,6 +256,8 @@ $dispcrit
 ENDREPLY
 }
 
+# ======================================================== Display all messages
+
 sub disall {
     my $r=shift;
     $r->print('<h1>Display All Messages</h1>'.
@@ -287,6 +290,47 @@ sub disall {
     $r->print('</table></body></html>');
 }
 
+# ============================================================== Compose output
+
+sub compout {
+    my ($r,$forwarding)=@_;
+      my $dispcrit='';
+    my $dissub='';
+    my $dismsg='';
+    my $func='Send New';
+      if (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) {
+         $dispcrit=
+	     '<input type=checkbox name=critmsg> Send as critical message<p>';
+      }
+    if ($forwarding) {
+       $dispcrit.='<input type=hidden name=forwid value="'.
+	   $forwarding.'">';
+       $func='Forward';
+      my %message=&Apache::lonnet::get('nohist_email',[$forwarding]);
+      my %content=&unpackagemsg($message{$forwarding});
+
+       $dissub='Forwarding: '.$content{'subject'};
+       $dismsg='Forwarded message from '.
+	   $content{'sendername'}.' at '.$content{'senderdomain'};
+    }
+    my $defdom=$ENV{'user.domain'};
+      $r->print(<<"ENDCOMP");
+<form action="/adm/email" method=post>
+<input type=hidden name=sendmail value=on>
+<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>
+<tr><td>Subject:</td><td><input type=text size=50 name=subject value="$dissub">
+</td></tr></table>
+<textarea name=message cols=60 rows=10>$dismsg
+</textarea><p>
+$dispcrit
+<input type=submit value="$func Mail">
+</form>
+ENDCOMP
+}
+
 # ===================================================================== Handler
 
 sub handler {
@@ -334,8 +378,11 @@ sub handler {
              '<table border=2><tr bgcolor="#FFFFAA"><td>Functions:</td>'.
            '<td><a href="/adm/email?replyto='.&Apache::lonnet::escape($msgid).
              '"><b>Reply</b></a></td>'.
-           '<td><a href="/adm/email?replyto='.&Apache::lonnet::escape($msgid).
+           '<td><a href="/adm/email?forward='.&Apache::lonnet::escape($msgid).
              '"><b>Forward</b></a></td>'.
+        '<td><a href="/adm/email?markunread='.&Apache::lonnet::escape($msgid).
+             '"><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'});
   } elsif ($ENV{'form.replyto'}) {
@@ -380,28 +427,47 @@ sub handler {
   } elsif ($ENV{'form.critical'}) {
       &discrit($r);
   } elsif ($ENV{'form.forward'}) {
+      &compout($r,$ENV{'form.forward'});
   } elsif ($ENV{'form.markread'}) {
   } elsif ($ENV{'form.markdel'}) {
       &statuschange($ENV{'form.markdel'},'deleted');
       &disall($r);
   } elsif ($ENV{'form.markunread'}) {
+      &statuschange($ENV{'form.markunread'},'new');
+      &disall($r);
   } elsif ($ENV{'form.compose'}) {
-      my $dispcrit='';
-      if (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) {
-         $dispcrit=
-	     '<input type=checkbox name=critmsg> Send as critical message<p>';
-      }
-      $r->print(<<"ENDCOMP");
-<form action="/adm/email" method=post>
-<input type=hidden name=sendmail value=on>
-Subject: <input type=text size=50 name=subject value=""><p>
-<textarea name=message cols=60 rows=10>
-</textarea><p>
-$dispcrit
-<input type=submit value="Send Mail">
-</form>
-ENDCOMP
+      &compout($r);
   } elsif ($ENV{'form.sendmail'}) {
+      my %content=();
+      undef %content;
+      if ($ENV{'form.forwid'}) {
+        my $msgid=$ENV{'form.forwid'};
+        my %message=&Apache::lonnet::get('nohist_email',[$msgid]);
+        %content=&unpackagemsg($message{$msgid});
+        &statuschange($msgid,'forwarded');
+        $ENV{'form.message'}.="\n\n-- Forwarded message --\n\n".
+	                       $content{'message'};
+      }
+      if (($ENV{'form.critmsg'}) && 
+          (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}))) {
+         $r->print('Sending critical: '.
+                &user_crit_msg($ENV{'form.recuname'},
+                                 $ENV{'form.recdomain'},
+                                 $ENV{'form.subject'},
+                                 $ENV{'form.message'},
+                                 $content{'citation'}));
+      } else {
+         $r->print('Sending: '.&user_normal_msg($ENV{'form.recuname'},
+                                 $ENV{'form.recdomain'},
+                                 $ENV{'form.subject'},
+                                 $ENV{'form.message'},
+                                 $content{'citation'}));
+      }
+      if ($ENV{'form.displayedcrit'}) {
+          &discrit($r);
+      } else {
+	  &disall($r);
+      }
   } else {
       &disall($r);
   }