X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=b1631628986c9013cec9df9c20772fb3847c85e0;hb=edfc15583881f720a65516d975d26cdb6b7c8469;hp=8a672744b45395c7a02450910780cabcea03253c;hpb=9a12175ae94f37babc48e2ee43484d1423afa3c1;p=spider.git

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 8a672744..b1631628 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -50,7 +50,7 @@ use vars qw($pc11_max_age $pc23_max_age $last_pc50 $eph_restime $eph_info_restim
 			$investigation_int $pc19_version $myprot_version
 			%nodehops $baddx $badspotter $badnode $censorpc $rspfcheck
 			$allowzero $decode_dk0wcy $send_opernam @checklist
-			$handle_xml);
+		   );
 
 $pc11_max_age = 1*3600;			# the maximum age for an incoming 'real-time' pc11
 $pc23_max_age = 1*3600;			# the maximum age for an incoming 'real-time' pc23
@@ -77,7 +77,6 @@ $chatdupeage = 20 * 60 * 60;
 $chatimportfn = "$main::root/chat_import";
 $investigation_int = 12*60*60;	# time between checks to see if we can see this node
 $pc19_version = 5466;			# the visible version no for outgoing PC19s generated from pc59
-$handle_xml = 0;				# handle XML sentences
 
 @checklist = 
 (
@@ -333,7 +332,7 @@ sub normal
 {
 	my ($self, $line) = @_;
 
-	if ($line =~ '^<\w+\s') {
+	if ($line =~ '^<\w+\s' && $main::do_xml) {
 		DXXml::normal($self, $line);
 		return;
 	}
@@ -847,7 +846,7 @@ sub handle_16
 		
 		# send info to all logged in thingies
 		$self->tell_login('loginu', "$ncall: $call") if DXUser->get_current($ncall)->is_local_node;
-		$self->tell_buddies('loginb', "$ncall: $call");
+		$self->tell_buddies('loginb', $call, $ncall);
 				
 		# add this station to the user database, if required
 #		$call =~ s/-\d+$//o;	# remove ssid for users
@@ -921,7 +920,7 @@ sub handle_17
 
 	# send info to all logged in thingies
 	$self->tell_login('logoutu', "$ncall: $ucall") if DXUser->get_current($ncall)->is_local_node;
-	$self->tell_buddies('logoutb', "$ncall: $ucall");
+	$self->tell_buddies('logoutb', $ucall, $ncall);
 
 	if (eph_dup($line)) {
 		dbg("PCPROT: dup PC17 detected") if isdbg('chanerr');
@@ -952,7 +951,7 @@ sub handle_18
 			$self->user->put;
 			$self->sort('S');
 		}
-		$self->{handle_xml}++ if $main::do_xml && $_[1] =~ /\bxml\b/;
+		$self->{handle_xml}++ if DXXml::available() && $_[1] =~ /\bxml\b/;
 	} else {
 		$self->version(50.0);
 		$self->version($_[2] / 100) if $_[2] && $_[2] =~ /^\d+$/;