--- loncom/interface/loncommunicate.pm	2004/03/26 19:35:59	1.21
+++ loncom/interface/loncommunicate.pm	2004/11/11 20:41:53	1.25
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Communicate
 #
-# $Id: loncommunicate.pm,v 1.21 2004/03/26 19:35:59 www Exp $
+# $Id: loncommunicate.pm,v 1.25 2004/11/11 20:41:53 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -38,19 +38,16 @@ use Apache::lonlocal;
 sub menu {
     my $r=shift;
     my %lt=&Apache::lonlocal::texthash(
-'vam' => 'View All Messages',
+'mnf' => 'Make New Folder',
 'vcm' => 'View Critical Messages',
 'smu' => 'Send Message to User(s)',
 'bmc' => 'Broadcast Message to Course',
 'dmu' => 'Distribute Messages from Uploaded File to Course',
 'unr' => 
      'User Notes, Records of Face-to-Face Discussions, and Critical Messages',
-'nm' => 'New Messages',
-'su' => 'Subject',
-'da' => 'Date',
-'us' => 'Username',
-'op' => 'Open',
-'do' => 'Domain'
+
+'cbs' => 'Configure blocking of student communication during exams' 
+
 );
     my %help=();
     foreach ('Course_Face_To_Face_Records,Course_Critical_Message',
@@ -59,14 +56,12 @@ sub menu {
     }
 # ------------------------------------------------------------------------ Menu
    $r->print(<<END);
+<form method="post" action="/adm/email">
+<input type="submit" value="$lt{'mnf'}" />
+<input type="text" size="15" name="newfolder" value="" />
+</form>
 <table cellspacing="10" cellpadding="2">
 <tr><td bgcolor="#FFFFAA">
-  <b><a href="/adm/email/">$lt{'vam'}</a></b>
-</td></tr>
-<tr><td bgcolor="#FFFFAA">
-  <b><a href="/adm/email?critical=display">$lt{'vcm'}</a></b>
-</td></tr>
-<tr><td bgcolor="#FFFFAA">
   <b><a href="/adm/email?compose=individual">$lt{'smu'}</a></b>
 </td></tr>
 END
@@ -82,51 +77,12 @@ END
 <tr><td bgcolor="#FFFFAA">
 <b><a href="/adm/email?recordftf=query">$lt{'unr'}</a></b>$help{'Course_Face_To_Face_Records,Course_Critical_Message'}
 </td></tr>
-
+<tr><td bgcolor="#FFFFAA">
+  <b><a href="/adm/email?block=display">$lt{'cbs'}</a>
+</td></tr>
 END
     }
     $r->print('</table>');
-    my @msgids = sort split(/\&/,&Apache::lonnet::reply
-                            ('keys:'.$ENV{'user.domain'}.':'.
-                             $ENV{'user.name'}.':nohist_email',
-                             $ENV{'user.home'}));
-    my @newmsgs;
-    foreach (@msgids) {
-        my ($sendtime,$shortsubj,$fromname,$fromdom,$status)=
-	    &Apache::lonmsg::unpackmsgid($_);
-       if (defined($sendtime) && $sendtime!~/error/) {
-        $sendtime = &Apache::lonlocal::locallocaltime($sendtime);
-        if ($status eq 'new') {
-            push @newmsgs, { 
-                msgid    => $_,
-                sendtime => $sendtime,
-                shortsub => &Apache::lonnet::unescape($shortsubj),
-                from     => $fromname,
-                fromdom  => $fromdom 
-                }
-        }
-       }
-    }
-    if ($#newmsgs >= 0) {
-        $r->print(<<TABLEHEAD);
-<h2>$lt{'nm'}</h2>
-<table border=2><tr><th>&nbsp</th>
-<th>$lt{'da'}</th><th>$lt{'us'}</th><th>$lt{'do'}</th><th>$lt{'su'}</th></tr>
-TABLEHEAD
-        foreach my $msg (@newmsgs) {
-            $r->print(<<"ENDLINK");
-<tr bgcolor="#FFBB77">
-<td><a href="/adm/email?display=$msg->{'msgid'}">$lt{'op'}</a></td>
-ENDLINK
-            foreach ('sendtime','from','fromdom','shortsub') {
-                $r->print("<td>$msg->{$_}</td>");
-            }
-            $r->print("</td></tr>");
-        }
-        $r->print('</table></body></html>');
-    } else {
-        $r->print("<h3>".&mt('You have no unread messages')."</h3>");
-    }
 }
 
 sub handler {
@@ -154,6 +110,7 @@ END
 # ---------------------------------------------------------------------- Header
     &Apache::lonmsg::header($r);
     &menu($r);
+    &Apache::lonmsg::disall($r,'new');
     return OK;
 }