X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXChannel.pm;h=36b221561c19775a570a7ca819c2dbd3f173be3b;hb=3d7b8f73c5a0a75fddfcc701a9c790ea3339a950;hp=b0208f103e0e6093df5b654c133420e110780419;hpb=b359511572b5dcd67dc17437e7ce4ca3574eada8;p=spider.git

diff --git a/perl/DXChannel.pm b/perl/DXChannel.pm
index b0208f10..36b22156 100644
--- a/perl/DXChannel.pm
+++ b/perl/DXChannel.pm
@@ -101,6 +101,7 @@ $count = 0;
 		  itu => '0,ITU Zone',
 		  cq => '0,CQ Zone',
 		  enhanced => '5,Enhanced Client,yesno',
+		  gtk => '5,Using GTK,yesno',
 		  senddbg => '8,Sending Debug,yesno',
 		  width => '0,Column Width',
 		  disconnecting => '9,Disconnecting,yesno',
@@ -118,14 +119,14 @@ $count = 0;
 		  lastmsgpoll => '0,Last Msg Poll,atime',
 		  inscript => '9,In a script,yesno',
 		  handle_xml => '9,Handles XML,yesno',
+		  do_pc92 => '9,Handles PC92,yesno',
+		  send_pc92 => '9,Send PC92,atime',
 		  inqueue => '9,Input Queue,parray',
 		 );
 
+
 use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
+($VERSION, $BRANCH) = dxver(q$Revision$);
 
 # object destruction
 sub DESTROY
@@ -153,7 +154,8 @@ sub alloc
 	if (defined $user) {
 		$self->{user} = $user;
 		$self->{lang} = $user->lang;
-		$user->new_group() if !$user->group;
+		$user->new_group unless $user->group;
+		$user->new_buddies unless $user->buddies;
 		$self->{group} = $user->group;
 		$self->{sort} = $user->sort;
 	}
@@ -357,7 +359,8 @@ sub send_now
         my @lines = split /\n/;
 		for (@lines) {
 			$conn->send_now("$sort$call|$_");
-			dbg("-> $sort $call $_") if isdbg('chan');
+			# debug log it, but not if it is a log message
+			dbg("-> $sort $call $_") if $sort ne 'L' && isdbg('chan');
 		}
 	}
 	$self->{t} = time;
@@ -380,7 +383,8 @@ sub send_later
         my @lines = split /\n/;
 		for (@lines) {
 			$conn->send_later("$sort$call|$_");
-			dbg("-> $sort $call $_") if isdbg('chan');
+			# debug log it, but not if it is a log message
+			dbg("-> $sort $call $_") if $sort ne 'L' && isdbg('chan');
 		}
 	}
 	$self->{t} = time;
@@ -468,7 +472,7 @@ sub disconnect
 	my $user = $self->{user};
 	
 	$user->close() if defined $user;
-	$self->{conn}->disconnect;
+	$self->{conn}->disconnect if $self->{conn};
 	$self->del();
 }
 
@@ -493,7 +497,9 @@ sub closeall
 #
 sub tell_login
 {
-	my ($self, $m) = @_;
+	my ($self, $m, $call) = @_;
+	
+	$call ||= $self->{call};
 	
 	# send info to all logged in thingies
 	my @dxchan = get_all_users();
@@ -501,7 +507,28 @@ sub tell_login
 	foreach $dxchan (@dxchan) {
 		next if $dxchan == $self;
 		next if $dxchan->{call} eq $main::mycall;
-		$dxchan->send($dxchan->msg($m, $self->{call})) if $dxchan->{logininfo};
+		$dxchan->send($dxchan->msg($m, $call)) if $dxchan->{logininfo};
+	}
+}
+
+#
+# Tell all the users if a buddy is logged or out
+#
+sub tell_buddies
+{
+	my ($self, $m, $call, $node) = @_;
+	
+	$call ||= $self->{call};
+	$call =~ s/-\d+$//;
+	$m .= 'n' if $node;
+	
+	# send info to all logged in thingies
+	my @dxchan = get_all_users();
+	my $dxchan;
+	foreach $dxchan (@dxchan) {
+		next if $dxchan == $self;
+		next if $dxchan->{call} eq $main::mycall;
+		$dxchan->send($dxchan->msg($m, $call, $node)) if grep $_ eq $call, @{$dxchan->{user}->{buddies}} ;
 	}
 }
 
@@ -700,6 +727,19 @@ sub process
 	}
 }
 
+sub handle_xml
+{
+	my $self = shift;
+	my $r = 0;
+	
+	if (DXXml::available()) {
+		$r = $self->{handle_xml} || 0;
+	} else {
+		delete $self->{handle_xml} if exists $self->{handle_xml};
+	}
+	return $r;
+}
+
 #no strict;
 sub AUTOLOAD
 {