--- loncom/interface/loncommunicate.pm	2006/11/29 07:53:55	1.35
+++ loncom/interface/loncommunicate.pm	2006/12/23 06:04:50	1.39
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Communicate
 #
-# $Id: loncommunicate.pm,v 1.35 2006/11/29 07:53:55 raeburn Exp $
+# $Id: loncommunicate.pm,v 1.39 2006/12/23 06:04:50 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -47,7 +47,6 @@ sub menu {
         }   
     }
     my %lt=&Apache::lonlocal::texthash(
-'mnf' => 'Make New Folder',
 'vcm' => 'View Critical Messages',
 'smu' => 'Send Message to User(s)',
 'bmc' => "Broadcast Message to $crstype",
@@ -65,7 +64,7 @@ sub menu {
 	$help{$_}=&Apache::loncommon::help_open_topic($_);
     }
 # ------------------------------------------------------------------------ Menu
-    my ($can_srm,$can_dcm);
+    my ($can_srm,$can_dcm,$can_dff);
     if ($env{'request.course.id'}) {
         if ((&Apache::lonnet::allowed('srm',$env{'request.course.id'})) ||
             (&Apache::lonnet::allowed('srm',$env{'request.course.id'}.'/'.
@@ -77,32 +76,40 @@ sub menu {
                                            $env{'request.course.sec'}))) {
             $can_dcm = 1;
         }
+        if ((&Apache::lonnet::allowed('dff',$env{'request.course.id'})) ||
+            (&Apache::lonnet::allowed('dff',$env{'request.course.id'}.'/'.
+                                           $env{'request.course.sec'}))) {
+            $can_dff = 1;
+        }
     }   
     $r->print(<<END);
 <table cellspacing="10" cellpadding="2">
-<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>
+<tr>
 <td bgcolor="#FFFFAA">
   <b><a href="/adm/email?compose=individual">$lt{'smu'}</a></b>
-</td></tr>
-<tr><td bgcolor="#FFFFAA">
+</td>
+<td bgcolor="#FFFFAA">
   <b><a href="/adm/$env{'user.domain'}/$env{'user.name'}/_rss.html">$lt{'blog'}</a></b>
 </td>
+</tr>
 END
-    if ($can_srm || !$can_dcm) {
-        $r->print('<td></td></tr>');
-    }
     if ($can_srm) {
         $r->print(<<END);
-<tr><td bgcolor="#FFFFAA">
+<tr>
+<td bgcolor="#FFFFAA">
     <b><a href="/adm/email?compose=group">$lt{'bmc'}</a></b>$help{'Course_Broadcast_Message'}
 </td>
 <td bgcolor="#FFFFAA">
   <b><a href="/adm/email?compose=upload">$lt{'dmu'}</a></b>
 </td></tr>
-<tr><td bgcolor="#FFFFAA">
+END
+    }
+    if ($can_dcm || $can_dff) {
+        $r->print('<tr>');
+    }
+    if ($can_dff) {
+        $r->print(<<END);
+<td bgcolor="#FFFFAA">
 <b><a href="/adm/email?recordftf=query">$lt{'unr'}</a></b>$help{'Course_Face_To_Face_Records,Course_Critical_Message'}
 </td>
 END
@@ -110,10 +117,10 @@ END
     if ($can_dcm) {
         $r->print('
 <td bgcolor="#FFFFAA">
-  <b><a href="/adm/email?block=display">'.$lt{'cbs'}.'</a>
+  <b><a href="/adm/email?block=display">'.$lt{'cbs'}.'</a></b>
 </td>');
     }
-    if ($can_srm || $can_dcm) {
+    if ($can_dff || $can_dcm) {
         $r->print('</tr>');
     }
     $r->print('</table>');
@@ -138,7 +145,7 @@ sub handler {
 # ---------------------------------------------------------------------- Header
     &Apache::lonmsgdisplay::header($r);
     &menu($r);
-    &Apache::lonmsgdisplay::disall($r,'new');
+    &Apache::lonmsgdisplay::disall($r,'INBOX','new');
     $r->print(&Apache::loncommon::end_page());
     return OK;
 }