--- loncom/interface/lonchatfetch.pm 2003/03/29 01:39:10 1.9 +++ loncom/interface/lonchatfetch.pm 2004/06/27 17:36:57 1.14 @@ -1,7 +1,7 @@ # The LearningOnline Network # Chat Fetching # -# $Id: lonchatfetch.pm,v 1.9 2003/03/29 01:39:10 www Exp $ +# $Id: lonchatfetch.pm,v 1.14 2004/06/27 17:36:57 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -29,7 +29,7 @@ package Apache::lonchatfetch; use strict; -use Apache::Constants qw(:common); +use Apache::Constants qw(:common :http); use Apache::lontexconvert; use Apache::loncommon; use Apache::lonnet; @@ -37,6 +37,12 @@ use Apache::lonnet; sub handler { my $r = shift; + if (! &Apache::lonnet::allowed('pch',$ENV{'request.course.id'}. + ($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:'')) + ) { + return HTTP_NOT_ACCEPTABLE; + } + my $loaderror=&Apache::lonnet::overloaderror($r); if ($loaderror) { return $loaderror; } $loaderror= @@ -57,8 +63,15 @@ sub handler { my @entries=split(/\:/, &Apache::lonnet::reply( "chatretr:$cdom:$cnum:$ENV{'user.domain'}:$ENV{'user.name'}",$chome)); - my ($lastid)=($entries[$#entries]=~/^(\w+)/); - my ($thentime,$idnum)=split(/\_/,$lastid); +# Figure out what the last valid entry-id is + my ($lastid,$thentime,$idnum); + foreach (@entries) { + $_=~/^(\w+)/; + if ($1 ne 'active_participant') { + $lastid=$1; + ($thentime,$idnum)=split(/\_/,$lastid); + } + } # ----------------------------------------------------------- Can see identity? my $crs='/'.$ENV{'request.course.id'}; if ($ENV{'request.course.sec'}) { @@ -80,8 +93,9 @@ sub handler { my ($id,$msg,$udom)=split(/\:/,&Apache::lonnet::unescape($_)); if ($id eq 'active_participant') { chomp($udom); - $participants[$#participants+1]= - &Apache::loncommon::nickname($msg,$udom); + my $participant= &Apache::loncommon::nickname($msg,$udom); + unless ($participant=~/\w/) { $participant=$msg.'@'.$udom; } + $participants[$#participants+1]=$participant; } elsif ($include) { chomp($msg); my ($msgtime,$msgnum)=split(/\_/,$id); @@ -89,7 +103,12 @@ sub handler { &Apache::lonnet::unescape($msg)); $contrib=&Apache::lonnet::unescape($contrib); $contrib=~s/\n/\
/g; - $contrib=&Apache::lontexconvert::msgtexconverted($contrib); + ($contrib,my $errors)=&Apache::lontexconvert::msgtexconverted($contrib); + if ($errors) { $contrib.="[Message not fully displayed due to incorrect embedded TeX]"; } + if ($errors && $snum eq $ENV{'user.name'} && + $sdom eq $ENV{'user.domain'} ) { + $contrib.="
[TeX error message: $errors]"; + } $contrib=~s/\n/ /g; $contrib=~s/\'/\&\#39\;/g; my $sender=''; @@ -99,14 +118,16 @@ sub handler { if (($nick) && ($nick ne $sender)) { $sender.=' '.$nick; } + unless ($sender) { $sender=$snum.'@'.$sdom; } if ($anon) { $sender.=' [Anon]' }; } elsif (!$anon) { $sender=&Apache::loncommon::nickname($snum,$sdom); + unless ($sender) { $sender=$snum.'@'.$sdom; } } else { $sender=&Apache::loncommon::screenname($snum,$sdom); unless ($sender) { $sender="Anonymous"; } } - $sender=~s/\'/\"/g; + $sender=~s/\'/\&\#39\;/g; my $color=$sender; $color=~tr/a-j/0-9/; $color=~tr/A-J/0-9/;