--- loncom/interface/loncommunicate.pm	2004/05/17 19:00:46	1.22
+++ loncom/interface/loncommunicate.pm	2006/04/13 17:57:17	1.32
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Communicate
 #
-# $Id: loncommunicate.pm,v 1.22 2004/05/17 19:00:46 raeburn Exp $
+# $Id: loncommunicate.pm,v 1.32 2006/04/13 17:57:17 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -31,27 +31,24 @@ package Apache::loncommunicate;
 
 use strict;
 use Apache::Constants qw(:common);
-use Apache::lonmsg();
+use Apache::lonmsgdisplay();
 use Apache::loncommon;
 use Apache::lonlocal;
+use Apache::lonnet;
 
 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' 
+
+'cbs' => 'Configure Blocking of Student Communication during Exams',
+'blog' => 'Edit to my Blogs' 
 
 );
     my %help=();
@@ -62,102 +59,38 @@ sub menu {
 # ------------------------------------------------------------------------ Menu
    $r->print(<<END);
 <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">
+<tr><td bgcolor="#FFFFAA"><form method="post" action="/adm/email">
+<input type="submit" value="$lt{'mnf'}" />
+<input type="text" size="15" name="newfolder" value="" />
+</form></td>
+<td bgcolor="#FFFFAA">
   <b><a href="/adm/email?compose=individual">$lt{'smu'}</a></b>
 </td></tr>
+<tr><td bgcolor="#FFFFAA">
+  <b><a href="/adm/$env{'user.domain'}/$env{'user.name'}/_rss.html">$lt{'blog'}</a></b>
+</td><td></td></tr>
 END
-    if (($ENV{'request.course.id'}) && 
-        (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}))) {
+    if (($env{'request.course.id'}) && 
+        (
+	 &Apache::lonnet::allowed('srm',$env{'request.course.id'}) ||
+	 &Apache::lonnet::allowed('srm',$env{'request.course.id'}.'/'.$env{'request.course.sec'})
+	 )) {
         $r->print(<<END);
 <tr><td bgcolor="#FFFFAA">
     <b><a href="/adm/email?compose=group">$lt{'bmc'}</a></b>$help{'Course_Broadcast_Message'}
-</td></tr>
-<tr><td bgcolor="#FFFFAA">
+</td>
+<td bgcolor="#FFFFAA">
   <b><a href="/adm/email?compose=upload">$lt{'dmu'}</a></b>
 </td></tr>
 <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">
+</td>
+<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;
-    my %setters = ();
-    my $startblock = 0;
-    my $endblock = 0;
-    my %blocked = ();
-    my $numblocked = 0;
-    # Check for blocking of display because of scheduled online exams.
-    &Apache::lonmsg::blockcheck(\%setters,\$startblock,\$endblock);
-    foreach (@msgids) {
-        my ($sendtime,$shortsubj,$fromname,$fromdom,$status)=
-	    &Apache::lonmsg::unpackmsgid($_);
-        if (defined($sendtime) && $sendtime!~/error/) {
-            my $numsendtime = $sendtime;
-            $sendtime = &Apache::lonlocal::locallocaltime($sendtime);
-            if ($status eq 'new') {
-                if ($numsendtime >= $startblock && ($numsendtime <= $endblock && $endblock > 0) ) {
-                    $blocked{$_} = 'ON';
-                    $numblocked ++;
-                } else {
-                    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>');
-    } elsif ($numblocked == 0) {
-        $r->print("<h3>".&mt('You have no unread messages')."</h3>");
-    }
-    if ($numblocked > 0) {
-        my $beginblock = &Apache::lonlocal::locallocaltime($startblock);
-        my $finishblock = &Apache::lonlocal::locallocaltime($endblock);
-        if ($numblocked == 1) {
-            $r->print("<h3>".&mt('You have').' '.$numblocked.' '.&mt('blocked unread message').".</h3>");
-            $r->print(&mt('This message is not viewable because').' ');
-        } else {
-            $r->print("<h3>".&mt('You have').' '.$numblocked.' '.&mt('blocked unread messages').".</h3>");
-            $r->print(&mt('These').' '.$numblocked.' '.&mt('messages are not viewable because '));
-        }
-        $r->print(
-&mt('display of LON-CAPA messages sent to you by other students between').' '.$beginblock.' '.&mt('and').' '.$finishblock.' '.&mt('is currently being blocked because of online exams').'.');
-        &Apache::lonmsg::build_block_table($r,$startblock,$endblock,\%setters);
-    }
 }
 
 sub handler {
@@ -168,12 +101,6 @@ sub handler {
 #
 # Start document
 #
-    $r->print(<<END);
-<html>
-<head>
-<title>The LearningOnline Network with CAPA</title>
-</head>
-END
 
 # ----------------------------------------------------------------- Breadcrumbs
     &Apache::lonhtmlcommon::clear_breadcrumbs();
@@ -183,8 +110,10 @@ END
           faq=>12,bug=>'Communication Tools',});
 
 # ---------------------------------------------------------------------- Header
-    &Apache::lonmsg::header($r);
+    &Apache::lonmsgdisplay::header($r);
     &menu($r);
+    &Apache::lonmsgdisplay::disall($r,'new');
+    $r->print(&Apache::loncommon::end_page());
     return OK;
 }