--- loncom/interface/lonchatfetch.pm 2004/06/27 17:14:28 1.13
+++ 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.13 2004/06/27 17:14:28 www Exp $
+# $Id: lonchatfetch.pm,v 1.16 2005/02/17 08:50:20 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -50,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;
@@ -86,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);
@@ -117,9 +119,11 @@ 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"; }
@@ -146,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">