--- loncom/interface/lonmsgdisplay.pm	2006/10/04 20:28:21	1.35.2.6
+++ loncom/interface/lonmsgdisplay.pm	2006/07/19 13:09:32	1.39
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging display
 #
-# $Id: lonmsgdisplay.pm,v 1.35.2.6 2006/10/04 20:28:21 albertel Exp $
+# $Id: lonmsgdisplay.pm,v 1.39 2006/07/19 13:09:32 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -270,14 +270,12 @@ sub discourse {
 	    &Apache::lonselstudent::get_people_in_class($env{'request.course.sec'});
     unshift @$current_members, (@$course_personnel);
     my %defaultUsers;
-    
-    $result .= '<input type="hidden" name="sendmode" value="group" />'."\n";
 
-    $result .= &Apache::lonselstudent::render_student_list($current_members,
-							   "compemail",
-							   "current",
-							   \%defaultUsers,
-							   1,"selectedusers",1);
+    $result = &Apache::lonselstudent::render_student_list($current_members,
+							  "compemail",
+							  "current",
+							  \%defaultUsers,
+							  1,"selectedusers",1);
 
     $result .= &Apache::lonselstudent::render_student_list($expired_members,
 							   "compemail",
@@ -640,7 +638,7 @@ sub disnew {
     my %lt=&Apache::lonlocal::texthash(
 				       'nm' => 'New Messages',
 				       'su' => 'Subject',
-                                       'co' => 'Course',
+                                       'co' => 'Course/Group',
 				       'da' => 'Date',
 				       'us' => 'Username',
 				       'op' => 'Open',
@@ -809,9 +807,9 @@ ENDDISHEADER
     }
     $r->print('</th><th>');
     if ($env{'form.sortedby'} eq "revcourse") {
-        $r->print('<a href = "?sortedby=course'.$fsqs.'">'.&mt('Course').'</a>');
+        $r->print('<a href = "?sortedby=course'.$fsqs.'">'.&mt('Course/Group').'</a>');
     } else {
-        $r->print('<a href = "?sortedby=revcourse'.$fsqs.'">'.&mt('Course').'</a>');
+        $r->print('<a href = "?sortedby=revcourse'.$fsqs.'">'.&mt('Course/Group').'</a>');
     }
     $r->print('</th><th>');
     if ($env{'form.sortedby'} eq "revstatus") {
@@ -1610,7 +1608,7 @@ sub build_block_table {
     my ($r,$startblock,$endblock,$setters) = @_;
     my %lt = &Apache::lonlocal::texthash(
         'cacb' => 'Currently active communication blocks',
-        'cour' => 'Course',
+        'cour' => 'Course/Group',
         'dura' => 'Duration',
         'blse' => 'Block set by'
     );
@@ -1790,7 +1788,7 @@ sub header {
     
     my $extra = &Apache::loncommon::studentbrowser_javascript();
     if ($baseurl) {
-	$extra .= "<base href=\"".&Apache::lonnet::absolute_url()."/$baseurl\" />";
+	$extra .= "<base href=\"http://$ENV{'SERVER_NAME'}/$baseurl\" />";
     }
     $r->print(&Apache::loncommon::start_page('Communication and Messages',
  					$extra));