--- loncom/interface/lonchatfetch.pm	2003/07/24 17:53:59	1.12
+++ 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.12 2003/07/24 17:53:59 matthew Exp $
+# $Id: lonchatfetch.pm,v 1.14 2004/06/27 17:36:57 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -93,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);
@@ -117,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/;