--- loncom/interface/loncommunicate.pm	2001/08/16 01:42:07	1.5
+++ loncom/interface/loncommunicate.pm	2002/02/05 00:01:32	1.8
@@ -1,6 +1,30 @@
 # The LearningOnline Network
 # Communicate
 #
+# $Id: loncommunicate.pm,v 1.8 2002/02/05 00:01:32 harris41 Exp $
+#
+# Copyright Michigan State University Board of Trustees
+#
+# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
+#
+# LON-CAPA is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# LON-CAPA is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LON-CAPA; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+# /home/httpd/html/adm/gpl.txt
+#
+# http://www.lon-capa.org/
+#
 # (Internal Server Error Handler
 #
 # (Login Screen
@@ -9,7 +33,8 @@
 #
 # 3/1/1 Gerd Kortemeyer)
 #
-# 3/1,2/6,7/27,8/3,8/15 Gerd Kortemeyer
+# 3/1,2/6,7/27,8/3,8/15,
+# 11/5/01 Gerd Kortemeyer
 #
 package Apache::loncommunicate;
 
@@ -36,9 +61,11 @@ sub handler {
 ENDDOCUMENT
     my $st='<table><tr><td bgcolor="#FFFFAA"><b>';
     my $en='</b></td><tr></table>';
-   $r->print('<p>'.$st.'<a href="/adm/email/">All Messages</a>'.$en.'<p>'.$st.
-   '<a href="/adm/email?compose=individual">Send message to user(s)</a>'.
-     $en);
+   $r->print('<p>'.
+ $st.'<a href="/adm/email/">All Messages</a>'.$en.'<p>'.
+ $st.'<a href="/adm/email?critical=display">Critical Messages</a>'.$en.'<p>'.
+ $st.'<a href="/adm/email?compose=individual">Send message to user(s)</a>'.$en
+     );
     if (($ENV{'request.course.id'}) && 
         (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}))) {
        $r->print(
@@ -52,7 +79,10 @@ ENDDOCUMENT
 <table border=2><tr><th>&nbsp</th>
 <th>Date</th><th>Username</th><th>Domain</th><th>Subject</th></tr>
 ENDTABLE
-    map {
+    foreach (sort split(/\&/,&Apache::lonnet::reply('keys:'.
+					$ENV{'user.domain'}.':'.
+                                        $ENV{'user.name'}.':nohist_email',
+					$ENV{'user.home'}))) {
         my ($sendtime,$shortsubj,$fromname,$fromdomain,$status)=
 	    &Apache::lonmsg::unpackmsgid($_);
         if ($status eq 'new') {
@@ -62,10 +92,7 @@ ENDTABLE
                   $fromname.'</td><td>'.$fromdomain.'</td><td>'.
 		      &Apache::lonnet::unescape($shortsubj).'</td></tr>');
         }
-    } sort split(/\&/,&Apache::lonnet::reply('keys:'.
-					$ENV{'user.domain'}.':'.
-                                        $ENV{'user.name'}.':nohist_email',
-                                        $ENV{'user.home'}));
+    }
     $r->print('</table></body></html>');
     return OK;
 }