--- loncom/interface/loncommunicate.pm	2006/03/19 22:22:49	1.30
+++ loncom/interface/loncommunicate.pm	2007/01/31 16:02:49	1.41
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Communicate
 #
-# $Id: loncommunicate.pm,v 1.30 2006/03/19 22:22:49 albertel Exp $
+# $Id: loncommunicate.pm,v 1.41 2007/01/31 16:02:49 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -31,24 +31,30 @@ 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 $crstype = 'Course';
+    my $usertype = 'Student';
+    if (defined($env{'course.'.$env{'request.course.id'}.'.type'})) {
+        $crstype = $env{'course.'.$env{'request.course.id'}.'.type'};
+        if ($crstype eq 'Group') {
+            $usertype = 'Member';
+        }   
+    }
     my %lt=&Apache::lonlocal::texthash(
-'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',
+'bmc' => "Broadcast Message to $crstype",
+'dmu' => "Distribute Messages from Uploaded File to $crstype",
 'unr' => 
      'User Notes, Records of Face-to-Face Discussions, and Critical Messages',
 
-'cbs' => 'Configure blocking of student communication during exams' 
-
+'cbs' => "Configure Blocking of $usertype Communication during Exams",
 );
     my %help=();
     foreach ('Course_Face_To_Face_Records,Course_Critical_Message',
@@ -56,36 +62,63 @@ sub menu {
 	$help{$_}=&Apache::loncommon::help_open_topic($_);
     }
 # ------------------------------------------------------------------------ Menu
-   $r->print(<<END);
+    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'}.'/'.
+                                           $env{'request.course.sec'}))) {
+            $can_srm = 1;
+        }
+        if ((&Apache::lonnet::allowed('dcm',$env{'request.course.id'})) ||
+            (&Apache::lonnet::allowed('dcm',$env{'request.course.id'}.'/'.
+                                           $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>
+</td>
+<td></td>
+</tr>
 END
-    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'})
-	 )) {
+    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>
-<td bgcolor="#FFFFAA">
-  <b><a href="/adm/email?block=display">$lt{'cbs'}</a>
-</td></tr>
 END
     }
+    if ($can_dcm) {
+        $r->print('
+<td bgcolor="#FFFFAA">
+  <b><a href="/adm/email?block=display">'.$lt{'cbs'}.'</a></b>
+</td>');
+    }
+    if ($can_dff || $can_dcm) {
+        $r->print('</tr>');
+    }
     $r->print('</table>');
 }
 
@@ -106,9 +139,9 @@ sub handler {
           faq=>12,bug=>'Communication Tools',});
 
 # ---------------------------------------------------------------------- Header
-    &Apache::lonmsg::header($r);
+    &Apache::lonmsgdisplay::header($r);
     &menu($r);
-    &Apache::lonmsg::disall($r,'new');
+    &Apache::lonmsgdisplay::disall($r);
     $r->print(&Apache::loncommon::end_page());
     return OK;
 }