X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=143b71e48e4a98c0ff141479aa76f1b73efb96a9;hb=0148e301a41d89c154254a457f7d79334eea9442;hp=76b9d25d4dee47029d20211d82f1664adca88e94;hpb=679037f49e292b15a73dce96699c15b9e3049711;p=spider.git

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 76b9d25d..143b71e4 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -333,7 +333,7 @@ sub normal
 {
 	my ($self, $line) = @_;
 
-	if ($line =~ '^<\w+\s') {
+	if ($line =~ '^<\w+\s' && $main::do_xml) {
 		DXXml::normal($self, $line);
 		return;
 	}
@@ -846,8 +846,8 @@ sub handle_16
 		}
 		
 		# send info to all logged in thingies
-		$self->tell_login('loginu', $call) if DXUser->get_current($ncall)->is_local_node;
-		$self->tell_buddies('loginb', $call);
+		$self->tell_login('loginu', "$ncall: $call") if DXUser->get_current($ncall)->is_local_node;
+		$self->tell_buddies('loginb', $call, $ncall);
 				
 		# add this station to the user database, if required
 #		$call =~ s/-\d+$//o;	# remove ssid for users
@@ -920,8 +920,8 @@ sub handle_17
 	}
 
 	# send info to all logged in thingies
-	$self->tell_login('logoutu', $ucall) if DXUser->get_current($ncall)->is_local_node;
-	$self->tell_buddies('logoutb', $ucall);
+	$self->tell_login('logoutu', "$ncall: $ucall") if DXUser->get_current($ncall)->is_local_node;
+	$self->tell_buddies('logoutb', $ucall, $ncall);
 
 	if (eph_dup($line)) {
 		dbg("PCPROT: dup PC17 detected") if isdbg('chanerr');