--- loncom/interface/lonchatfetch.pm	2002/09/09 21:01:58	1.4
+++ loncom/interface/lonchatfetch.pm	2003/03/28 23:16:25	1.8
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Chat Fetching
 #
-# $Id: lonchatfetch.pm,v 1.4 2002/09/09 21:01:58 www Exp $
+# $Id: lonchatfetch.pm,v 1.8 2003/03/28 23:16:25 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -36,6 +36,14 @@ use Apache::lonnet;
 
 sub handler {
     my $r = shift;
+
+    my $loaderror=&Apache::lonnet::overloaderror($r);
+    if ($loaderror) { return $loaderror; }
+    $loaderror=
+       &Apache::lonnet::overloaderror($r,
+         $ENV{'course.'.$ENV{'request.course.id'}.'.home'});
+    if ($loaderror) { return $loaderror; }
+
     $r->content_type('text/html');
     $r->send_http_header;
     return OK if $r->header_only;
@@ -47,7 +55,8 @@ sub handler {
     my $chome=$ENV{'course.'.$ENV{'request.course.id'}.'.home'};
 
     my @entries=split(/\:/,
-                       &Apache::lonnet::reply("chatretr:$cdom:$cnum",$chome));
+       &Apache::lonnet::reply(
+        "chatretr:$cdom:$cnum:$ENV{'user.domain'}:$ENV{'user.name'}",$chome));
     my ($lastid)=($entries[$#entries]=~/^(\w+)/);
     my ($thentime,$idnum)=split(/\_/,$lastid);
 # ----------------------------------------------------------- Can see identity?
@@ -68,40 +77,50 @@ sub handler {
     }
     foreach (@entries) {
 	if ($include) {
-            my ($id,$msg)=split(/\:/,&Apache::lonnet::unescape($_));
-            chomp($msg);
-            my ($msgtime,$msgnum)=split(/\_/,$id);
-            my ($sdom,$snum,$anon,$contrib)=split(/\:/,
+	    my ($id,$msg,$uname)=split(/\:/,&Apache::lonnet::unescape($_));
+	    if ($id eq 'active_participant') {
+#		$newstuff.='participant: '.$msg.' '.$uname;
+	    } else {
+		chomp($msg);
+		my ($msgtime,$msgnum)=split(/\_/,$id);
+		my ($sdom,$snum,$anon,$contrib)=split(/\:/,
                                               &Apache::lonnet::unescape($msg));
-            $contrib=&Apache::lonnet::unescape($contrib);
-            $contrib=~s/\n/\<br \/\>/g;
-	    $contrib=&Apache::lontexconvert::msgtexconverted($contrib);
-            $contrib=~s/\n/ /g;
-            $contrib=~s/\'/\&\#39\;/g;
-            my $sender='';
-            unless (($anon) && (!$seeid)) {
-               $sender=&Apache::loncommon::plainname($snum,$sdom);
-	        if ($anon) { $sender.=' [Anon]' };
-            } else {
-		$sender=&Apache::loncommon::screenname($snum,$sdom);
-                unless ($sender) { $sender="Anonymous"; }
-            }
-            $sender=~s/\'/\"/g;
-            my $color=$sender;
-            $color=~tr/a-j/0-9/;
-            $color=~tr/A-J/0-9/;
-            $color=~tr/k-t/0-9/;
-            $color=~tr/K-T/0-9/;
-            $color=~tr/u-z/0-5/;
-            $color=~tr/U-Z/0-5/;
-            $color=~s/\D//g;
-            $color=substr($color,0,6);
-            my $timestamp=localtime($msgtime);
-            my ($mhour,$mmin,$msec)=($timestamp=~/(\d\d)\:(\d\d)\:(\d\d)/);
-	    $newstuff.='<font color="#'.$color.'"><a name="'.$id.'"><b>'.
-                       $sender.'</b> ('.$mhour.':'.$mmin.':'.$msec.'): '.
-                       $contrib."</font><br>";
-            $bottomid=$id;
+		$contrib=&Apache::lonnet::unescape($contrib);
+		$contrib=~s/\n/\<br \/\>/g;
+		$contrib=&Apache::lontexconvert::msgtexconverted($contrib);
+		$contrib=~s/\n/ /g;
+		$contrib=~s/\'/\&\#39\;/g;
+		my $sender='';
+		if ($seeid) {
+		    $sender=&Apache::loncommon::plainname($snum,$sdom);
+		    my $nick=&Apache::loncommon::nickname($snum,$sdom);
+		    if (($nick) && ($nick ne $sender)) {
+			$sender.=' '.$nick;
+		    }
+		    if ($anon) { $sender.=' [Anon]' };
+		} elsif (!$anon) {
+		    $sender=&Apache::loncommon::nickname($snum,$sdom);
+		} else {
+		    $sender=&Apache::loncommon::screenname($snum,$sdom);
+		    unless ($sender) { $sender="Anonymous"; }
+		}
+		$sender=~s/\'/\"/g;
+		my $color=$sender;
+		$color=~tr/a-j/0-9/;
+		$color=~tr/A-J/0-9/;
+		$color=~tr/k-t/0-9/;
+		$color=~tr/K-T/0-9/;
+		$color=~tr/u-z/0-5/;
+		$color=~tr/U-Z/0-5/;
+		$color=~s/\D//g;
+		$color=substr($color,0,6);
+		my $timestamp=localtime($msgtime);
+		my ($mhour,$mmin,$msec)=($timestamp=~/(\d\d)\:(\d\d)\:(\d\d)/);
+		$newstuff.='<font color="#'.$color.'"><a name="'.$id.'"><b>'.
+		    $sender.'</b> ('.$mhour.':'.$mmin.':'.$msec.'): '.
+		    $contrib."</font><br>";
+		$bottomid=$id;
+	    }
         } else {
             $_=~/^(\w+)/;
             if ($1 eq $ENV{'form.lastid'}) { $include=1; }