--- loncom/interface/lonmsg.pm	2001/08/03 14:00:07	1.12
+++ loncom/interface/lonmsg.pm	2001/08/03 18:47:18	1.15
@@ -201,8 +201,12 @@ sub statuschange {
             ($status{$msgid} eq 'forwarded')) {
 	&Apache::lonnet::put('email_status',{$msgid => $newstatus});
     }
+    if (($newstatus eq 'deleted') || ($newstatus eq 'new')) {
+	&Apache::lonnet::put('email_status',{$msgid => $newstatus});
+    }
 }
-# ===================================================================== Handler
+
+# ==================================================== Display Critical Message
 
 sub discrit {
     my $r=shift;
@@ -216,11 +220,118 @@ sub discrit {
 	  $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="rec_'.$_.'" value="Confirm Receipt">'.
+ '<input type=submit name="reprec_'.$_.'" value="Confirm Receipt and Reply">');
       } sort keys %what;
       $r->print('</form>');
 }
 
+# =============================================================== Compose reply
+
+sub comprep {
+    my ($r,$msgid)=@_;
+      my %message=&Apache::lonnet::get('nohist_email',[$msgid]);
+      my %content=&unpackagemsg($message{$msgid});
+      my $quotemsg='> '.$content{'message'};
+      $quotemsg=~s/\r/\n/g;
+      $quotemsg=~s/\f/\n/g;
+      $quotemsg=~s/\n+/\n\> /g;
+      my $subject='Re: '.$content{'subject'};
+      my $dispcrit='';
+      if (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) {
+         $dispcrit=
+	     '<input type=checkbox name=critmsg> Send as critical message<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=60 rows=10>
+$quotemsg
+</textarea><p>
+$dispcrit
+<input type=submit value="Send Reply">
+</form>
+ENDREPLY
+}
+
+# ======================================================== Display all messages
+
+sub disall {
+    my $r=shift;
+    $r->print('<h1>Display All Messages</h1>'.
+     '<table border=2><tr><th colspan=2>&nbsp</th><th>Date</th>'.
+     '<th>Username</th><th>Domain</th><th>Subject</th><th>Status</th></tr>');
+    map {
+        my ($sendtime,$shortsubj,$fromname,$fromdomain,$status)=
+	    &Apache::lonmsg::unpackmsgid($_);
+       unless ($status eq 'deleted') {
+        if ($status eq 'new') {
+	    $r->print('<tr bgcolor="#FFBB77">');
+        } elsif ($status eq 'read') {
+	    $r->print('<tr bgcolor="#BBBB77">');
+        } elsif ($status eq 'replied') {
+	    $r->print('<tr bgcolor="#AAAA88">');
+	} else {
+	    $r->print('<tr bgcolor="#99BBBB">');
+        }
+        $r->print('<td><a href="/adm/email?display='.$_.
+                  '">Open</a></td><td><a href="/adm/email?markdel='.$_.
+                  '">Delete</a></td><td>'.localtime($sendtime).'</td><td>'.
+                  $fromname.'</td><td>'.$fromdomain.'</td><td>'.
+		      &Apache::lonnet::unescape($shortsubj).'</td><td>'.
+                      $status.'</td></tr>');
+       }
+    } sort split(/\&/,&Apache::lonnet::reply('keys:'.
+					$ENV{'user.domain'}.':'.
+                                        $ENV{'user.name'}.':nohist_email',
+                                        $ENV{'user.home'}));
+    $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 {
     my $r=shift;
 
@@ -238,7 +349,8 @@ sub handler {
        $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 'mark') ||
+           ($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}) {
@@ -261,35 +373,19 @@ sub handler {
       $r->print('<b>Subject:</b> '.$content{'subject'}.
              '<br><b>From:</b> '.$content{'sendername'}.' at '.
                                  $content{'senderdomain'}.
-             '<br><b>Time:</b> '.$content{'time'}.'<hr>Functions: '.
-             '<a href="/adm/email?replyto='.&Apache::lonnet::escape($msgid).
-             '"><b>Reply</b></a><hr><pre>'.
+             '<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).
+             '"><b>Reply</b></a></td>'.
+           '<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'}) {
-      my $msgid=$ENV{'form.replyto'};
-      my %message=&Apache::lonnet::get('nohist_email',[$msgid]);
-      my %content=&unpackagemsg($message{$msgid});
-      my $quotemsg='> '.$content{'message'};
-      $quotemsg=~s/\r/\n/g;
-      $quotemsg=~s/\f/\n/g;
-      $quotemsg=~s/\n+/\n\> /g;
-      my $subject='Re: '.$content{'subject'};
-      my $dispcrit='';
-      if (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) {
-         $dispcrit=
-	     '<input type=checkbox name=critmsg> Send as critical message<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=60 rows=10>
-$quotemsg
-</textarea><p>
-$dispcrit
-<input type=submit value="Send Reply">
-</form>
-ENDREPLY
+      &comprep($r,$ENV{'form.replyto'});
   } elsif ($ENV{'form.sendreply'}) {
       my $msgid=$ENV{'form.sendreply'};
       my %message=&Apache::lonnet::get('nohist_email',[$msgid]);
@@ -308,61 +404,41 @@ ENDREPLY
                                  $ENV{'form.subject'},
                                  $ENV{'form.message'}));
       }
+      if ($ENV{'form.displayedcrit'}) {
+          &discrit($r);
+      } else {
+	  &disall($r);
+      }
   } elsif ($ENV{'form.confirm'}) {
       map {
           if ($_=~/^form\.rec\_(.*)$/) {
 	      $r->print('<b>Confirming Receipt:</b> '.
                         &user_crit_received($1).'<br>');
           }
+          if ($_=~/^form\.reprec\_(.*)$/) {
+              my $msgid=$1;
+	      $r->print('<b>Confirming Receipt:</b> '.
+                        &user_crit_received($msgid).'<br>');
+              &comprep($r,$msgid);
+          }
       } keys %ENV;
       &discrit($r);
   } elsif ($ENV{'form.critical'}) {
       &discrit($r);
   } elsif ($ENV{'form.forward'}) {
-  } elsif ($ENV{'form.mark'}) {
+      &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'}) {
   } else {
-    $r->print('<table border=2><tr><th>&nbsp</th><th>Date</th>'.
-     '<th>Username</th><th>Domain</th><th>Subject</th><th>Status</th></tr>');
-    map {
-        my ($sendtime,$shortsubj,$fromname,$fromdomain,$status)=
-	    &Apache::lonmsg::unpackmsgid($_);
-        if ($status eq 'new') {
-	    $r->print('<tr bgcolor="#FFBB77">');
-        } elsif ($status eq 'read') {
-	    $r->print('<tr bgcolor="#BBBB77">');
-        } elsif ($status eq 'replied') {
-	    $r->print('<tr bgcolor="#AAAA88">');
-	} else {
-	    $r->print('<tr bgcolor="#99BBBB">');
-        }
-        $r->print('<td><a href="/adm/email?display='.$_.
-                  '">Open</a></td><td>'.localtime($sendtime).'</td><td>'.
-                  $fromname.'</td><td>'.$fromdomain.'</td><td>'.
-		      &Apache::lonnet::unescape($shortsubj).'</td><td>'.
-                      $status.'</td></tr>');
-    } sort split(/\&/,&Apache::lonnet::reply('keys:'.
-					$ENV{'user.domain'}.':'.
-                                        $ENV{'user.name'}.':nohist_email',
-                                        $ENV{'user.home'}));
-    $r->print('</table></body></html>');
-
+      &disall($r);
   }
   $r->print('</body></html>');
   return OK;