--- loncom/interface/lonchatfetch.pm 2003/06/23 19:59:54 1.10
+++ loncom/interface/lonchatfetch.pm 2005/02/17 08:50:20 1.16
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Chat Fetching
#
-# $Id: lonchatfetch.pm,v 1.10 2003/06/23 19:59:54 www Exp $
+# $Id: lonchatfetch.pm,v 1.16 2005/02/17 08:50:20 albertel 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=
@@ -44,7 +50,7 @@ sub handler {
$ENV{'course.'.$ENV{'request.course.id'}.'.home'});
if ($loaderror) { return $loaderror; }
- $r->content_type('text/html');
+ &Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
return OK if $r->header_only;
@@ -80,15 +86,17 @@ sub handler {
my $bottomid='';
unless ($ENV{'form.lastid'}) {
$include=1;
- $newstuff='<html><body bgcolor="#FFFFFF">';
+ my $html=&Apache::lonxml::xmlbegin();
+ $newstuff=$html.'<head></head><body bgcolor="#FFFFFF">';
}
my @participants=();
foreach (@entries) {
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);
@@ -96,7 +104,12 @@ sub handler {
&Apache::lonnet::unescape($msg));
$contrib=&Apache::lonnet::unescape($contrib);
$contrib=~s/\n/\<br \/\>/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.="<br />[TeX error message: $errors]";
+ }
$contrib=~s/\n/ /g;
$contrib=~s/\'/\&\#39\;/g;
my $sender='';
@@ -106,14 +119,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/;
@@ -135,8 +150,9 @@ sub handler {
}
}
my $participant_output=join('<br />',sort @participants);
+ my $html=&Apache::lonxml::xmlbegin();
$r->print(<<ENDDOCUMENT);
-<html>
+$html
<head>
<title>The LearningOnline Network with CAPA</title>
<meta HTTP-EQUIV="Refresh" CONTENT="5; url=/adm/chatfetch?lastid=$lastid">