X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXChannel.pm;h=929e7e530183ed71d62be1c2e4b9ff4701d122ed;hb=96cc9f4bef1a1bba4066f62f75025efc31f5de37;hp=90e19ef9e2bb433c3d80b397286ed757a7db8c97;hpb=6c06ed486e67b3e36e9af4794d2eb84f59f249c4;p=spider.git

diff --git a/perl/DXChannel.pm b/perl/DXChannel.pm
index 90e19ef9..929e7e53 100644
--- a/perl/DXChannel.pm
+++ b/perl/DXChannel.pm
@@ -117,12 +117,15 @@ $count = 0;
 		  ve7cc => '0,VE7CC program special,yesno',
 		  lastmsgpoll => '0,Last Msg Poll,atime',
 		  inscript => '9,In a script,yesno',
+		  handle_xml => '9,Handles XML,yesno',
 		  inqueue => '9,Input Queue,parray',
 		 );
 
 use vars qw($VERSION $BRANCH);
-
-main::mkver($VERSION = q$Revision$);
+$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;
 
 # object destruction
 sub DESTROY
@@ -150,7 +153,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;
 	}
@@ -175,6 +179,14 @@ sub alloc
 	return $channels{$call} = $self;
 }
 
+# rebless this channel as something else
+sub rebless
+{
+	my $self = shift;
+	my $class = shift;
+	return $channels{$self->{call}} = bless $self, $class;
+}
+
 sub rec	
 {
 	my ($self, $msg) = @_;
@@ -185,10 +197,10 @@ sub rec
 	}
 }
 
-# obtain a channel object by callsign [$obj = DXChannel->get($call)]
+# obtain a channel object by callsign [$obj = DXChannel::get($call)]
 sub get
 {
-	my ($pkg, $call) = @_;
+	my $call = shift;
 	return $channels{$call};
 }
 
@@ -264,7 +276,7 @@ sub is_bbs
 sub is_node
 {
 	my $self = shift;
-	return $self->{'sort'} =~ /[ACRSX]/;
+	return $self->{'sort'} =~ /[ACRSXW]/;
 }
 # is it an ak1a node ?
 sub is_ak1a
@@ -385,15 +397,16 @@ sub send						# this is always later and always data
 	return unless $conn;
 	my $call = $self->{call};
 
-	for (@_) {
-#		chomp;
-        my @lines = split /\n/;
-		for (@lines) {
-			$conn->send_later("D$call|$_");
-			dbg("-> D $call $_") if isdbg('chan');
+	foreach my $l (@_) {
+		for (ref $l ? @$l : $l) {
+			my @lines = split /\n/;
+			for (@lines) {
+				$conn->send_later("D$call|$_");
+				dbg("-> D $call $_") if isdbg('chan');
+			}
 		}
 	}
-	$self->{t} = time;
+	$self->{t} = $main::systime;
 }
 
 # send a file (always later)
@@ -481,7 +494,30 @@ 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();
+	my $dxchan;
+	foreach $dxchan (@dxchan) {
+		next if $dxchan == $self;
+		next if $dxchan->{call} eq $main::mycall;
+		$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+$//;
+	my $s = $node ? "$node: $call" : $call;
 	
 	# send info to all logged in thingies
 	my @dxchan = get_all_users();
@@ -489,7 +525,7 @@ 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, $s)) if grep $_ eq $call, @{$dxchan->{user}->{buddies}} ;
 	}
 }