--- loncom/interface/lonchatfetch.pm 2006/05/09 14:38:09 1.23 +++ loncom/interface/lonchatfetch.pm 2006/07/03 00:11:53 1.29 @@ -1,7 +1,7 @@ # The LearningOnline Network # Chat Fetching # -# $Id: lonchatfetch.pm,v 1.23 2006/05/09 14:38:09 albertel Exp $ +# $Id: lonchatfetch.pm,v 1.29 2006/07/03 00:11:53 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -33,6 +33,10 @@ use Apache::Constants qw(:common :http); use Apache::lontexconvert; use Apache::loncommon; use Apache::lonnet; +use Apache::longroup; +use lib '/home/httpd/lib/perl/'; +use LONCAPA; + sub handler { my $r = shift; @@ -44,16 +48,18 @@ sub handler { 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) ) { + if ((! &Apache::lonnet::allowed('pgc',$env{'request.course.id'}.'/'. + $group)) && + (! &Apache::lonnet::allowed('vcg',$env{'request.course.id'}))) { + return HTTP_NOT_ACCEPTABLE; } - my %curr_groups = &Apache::loncommon::coursegroups($cdom,$cnum,$group); + my %curr_groups = &Apache::longroup::coursegroups($cdom,$cnum,$group); if (%curr_groups) { my %group_info = - &Apache::loncommon::get_group_settings($curr_groups{$group}); + &Apache::longroup::get_group_settings($curr_groups{$group}); $grouptitle = - ''.&Apache::lonnet::unescape($group_info{description}). + ''.&unescape($group_info{description}). '
'; } } elsif (! &Apache::lonnet::allowed('pch',$env{'request.course.id'}. @@ -106,7 +112,7 @@ sub handler { } my @participants=(); foreach (@entries) { - my ($id,$msg,$udom)=split(/\:/,&Apache::lonnet::unescape($_)); + my ($id,$msg,$udom)=split(/\:/,&unescape($_)); if ($id eq 'active_participant') { chomp($udom); my $participant= &Apache::loncommon::nickname($msg,$udom); @@ -116,8 +122,8 @@ sub handler { chomp($msg); my ($msgtime,$msgnum)=split(/\_/,$id); my ($sdom,$snum,$anon,$contrib)=split(/\:/, - &Apache::lonnet::unescape($msg)); - $contrib=&Apache::lonnet::unescape($contrib); + &unescape($msg)); + $contrib=&unescape($contrib); &Apache::lonfeedback::newline_to_br(\$contrib); ($contrib,my $errors)=&Apache::lontexconvert::msgtexconverted($contrib); if ($errors) { $contrib.="[Message not fully displayed due to incorrect embedded TeX]"; } @@ -155,10 +161,10 @@ sub handler { $color=substr($color,0,6); my $timestamp=localtime($msgtime); my ($mhour,$mmin,$msec)=($timestamp=~/(\d\d)\:(\d\d)\:(\d\d)/); - $newstuff.=''. + $newstuff.=''. $sender.' ('.$mhour.':'.$mmin.':'.$msec.'): '. - $contrib."
"; - $bottomid=$id; + $contrib."

"; + $bottomid='LC_'.$id; } else { $_=~/^(\w+)/; if ($1 eq $env{'form.lastid'}) { $include=1; } @@ -167,7 +173,7 @@ sub handler { my $participant_output=join('
',sort @participants); my $refresh_cmd = "/adm/chatfetch?lastid=$lastid"; if (defined($group)) { - $refresh_cmd .= "&group=$group"; + $refresh_cmd .= "&group=$group"; } my $start_page = &Apache::loncommon::start_page('Chat',undef,