--- loncom/interface/lonchatfetch.pm	2002/09/09 21:01:58	1.4
+++ loncom/interface/lonchatfetch.pm	2002/09/16 20:15:10	1.6
@@ -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.6 2002/09/16 20:15:10 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;
@@ -79,9 +87,15 @@ sub handler {
             $contrib=~s/\n/ /g;
             $contrib=~s/\'/\&\#39\;/g;
             my $sender='';
-            unless (($anon) && (!$seeid)) {
+            if ($seeid) {
                $sender=&Apache::loncommon::plainname($snum,$sdom);
-	        if ($anon) { $sender.=' [Anon]' };
+               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"; }