--- loncom/interface/lonmsg.pm	2001/08/03 14:54:52	1.13
+++ loncom/interface/lonmsg.pm	2001/08/03 17:16:48	1.14
@@ -201,7 +201,11 @@ 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});
+    }
 }
+
 # ==================================================== Display Critical Message
 
 sub discrit {
@@ -251,6 +255,38 @@ $dispcrit
 ENDREPLY
 }
 
+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>');
+}
+
 # ===================================================================== Handler
 
 sub handler {
@@ -270,7 +306,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}) {
@@ -293,9 +330,13 @@ 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?replyto='.&Apache::lonnet::escape($msgid).
+             '"><b>Forward</b></a></td>'.
+             '</tr></table><p><pre>'.
              $content{'message'}.'</pre><hr>'.$content{'citation'});
   } elsif ($ENV{'form.replyto'}) {
       &comprep($r,$ENV{'form.replyto'});
@@ -317,6 +358,11 @@ sub handler {
                                  $ENV{'form.subject'},
                                  $ENV{'form.message'}));
       }
+      if ($ENV{'form.displayedcrit'}) {
+          &discrit($r);
+      } else {
+	  &disall($r);
+      }
   } elsif ($ENV{'form.confirm'}) {
       map {
           if ($_=~/^form\.rec\_(.*)$/) {
@@ -334,7 +380,11 @@ sub handler {
   } elsif ($ENV{'form.critical'}) {
       &discrit($r);
   } elsif ($ENV{'form.forward'}) {
-  } elsif ($ENV{'form.mark'}) {
+  } elsif ($ENV{'form.markread'}) {
+  } elsif ($ENV{'form.markdel'}) {
+      &statuschange($ENV{'form.markdel'},'deleted');
+      &disall($r);
+  } elsif ($ENV{'form.markunread'}) {
   } elsif ($ENV{'form.compose'}) {
       my $dispcrit='';
       if (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) {
@@ -353,31 +403,7 @@ $dispcrit
 ENDCOMP
   } 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;