--- loncom/interface/lonchatfetch.pm	2006/03/23 22:32:10	1.20
+++ loncom/interface/lonchatfetch.pm	2006/03/29 21:16:18	1.22
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Chat Fetching
 #
-# $Id: lonchatfetch.pm,v 1.20 2006/03/23 22:32:10 albertel Exp $
+# $Id: lonchatfetch.pm,v 1.22 2006/03/29 21:16:18 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -37,7 +37,28 @@ use Apache::lonnet;
 sub handler {
     my $r = shift;
 
-    if (! &Apache::lonnet::allowed('pch',$env{'request.course.id'}.
+    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+					    ['lastid','group']);
+    my ($group,$grouptitle);
+    my $cnum=$env{'course.'.$env{'request.course.id'}.'.num'};
+    my $cdom=$env{'course.'.$env{'request.course.id'}.'.domain'};
+    if (defined($env{'form.group'})) {
+        $group = $env{'form.group'};
+        if (! &Apache::lonnet::allowed('pgc',$env{'request.course.id'}.'/'.
+				       $group) ) {
+            return HTTP_NOT_ACCEPTABLE;
+        }
+        my %curr_groups;
+        my $numgroups = &Apache::loncommon::coursegroups(\%curr_groups,$cdom,
+							 $cnum,$group);
+        if ($numgroups) {
+            my %group_info = 
+		&Apache::loncommon::get_group_settings($curr_groups{$group});
+            $grouptitle = 
+		'<b>'.&Apache::lonnet::unescape($group_info{description}).
+		'</b><br />';
+        }
+    } elsif (! &Apache::lonnet::allowed('pch',$env{'request.course.id'}.
              ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''))
         ) {
         return HTTP_NOT_ACCEPTABLE;
@@ -56,13 +77,12 @@ sub handler {
 
 # ------------------------------------------------------------ retrieve entries
 
-    my $cnum=$env{'course.'.$env{'request.course.id'}.'.num'};
-    my $cdom=$env{'course.'.$env{'request.course.id'}.'.domain'};
     my $chome=$env{'course.'.$env{'request.course.id'}.'.home'};
 
     my @entries=split(/\:/,
        &Apache::lonnet::reply(
-        "chatretr:$cdom:$cnum:$env{'user.domain'}:$env{'user.name'}",$chome));
+        "chatretr:$cdom:$cnum:$env{'user.domain'}:$env{'user.name'}:$group",
+        $chome));
 # Figure out what the last valid entry-id is
     my ($lastid,$thentime,$idnum);
     foreach (@entries) {
@@ -73,14 +93,8 @@ sub handler {
 	}
     }
 # ----------------------------------------------------------- Can see identity?
-    my $crs='/'.$env{'request.course.id'};
-    if ($env{'request.course.sec'}) {
-       $crs.='_'.$env{'request.course.sec'};
-    }                 
-    $crs=~s/\_/\//g;
-    my $seeid=&Apache::lonnet::allowed('rin',$crs);
+    my $seeid = &get_seeid_status();
 # -------------------------------------------------------- see which ones apply
-    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['lastid']);
     my $include=0;
     my $newstuff='';
     my $bottomid='';
@@ -153,9 +167,13 @@ sub handler {
 	}
     }
     my $participant_output=join('<br />',sort @participants);
+    my $refresh_cmd = "/adm/chatfetch?lastid=$lastid";
+    if (defined($group)) {
+        $refresh_cmd .= "&group=$group";
+    }
     my $start_page = 
 	&Apache::loncommon::start_page('Chat',undef,
-				       {'redirect'  => [5,"/adm/chatfetch?lastid=$lastid"],
+				       {'redirect'  => [5,$refresh_cmd],
 					'only_body' => 1,});
     my $end_page = &Apache::loncommon::end_page();
     $r->print(<<ENDDOCUMENT);
@@ -164,11 +182,27 @@ $start_page
 parent.chatout.document.writeln('$newstuff');
 parent.chatout.scroll(0,10000000);
 </script>
+$grouptitle
 $participant_output
 $end_page
 ENDDOCUMENT
     return OK;
-} 
+}
+
+sub get_seeid_status {
+    my $crs='/'.$env{'request.course.id'};
+    my $seeid;
+    if (exists($env{'form.group'})) {
+        $seeid = &Apache::lonnet::allowed('rci',$crs.'/'.$env{'form.group'});
+    } else {
+        if ($env{'request.course.sec'}) {
+            $crs.='_'.$env{'request.course.sec'};
+        }
+        $crs=~s/\_/\//g;
+        $seeid=&Apache::lonnet::allowed('rin',$crs);
+    }
+    return $seeid;
+}
 
 1;
 __END__