X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=perl%2FDXChannel.pm;h=e4b513f6a4d0efb0b84b4e74755865dd2d1f1710;hb=c6a62ff483f8887b4157e111a405fef971ade8d9;hp=7526099e895ccff4d0d86a47c7e69ccc857ee0ef;hpb=63cd679163fe336521e95e8af821b30d4bc1b9e9;p=spider.git

diff --git a/perl/DXChannel.pm b/perl/DXChannel.pm
index 7526099e..e4b513f6 100644
--- a/perl/DXChannel.pm
+++ b/perl/DXChannel.pm
@@ -19,7 +19,7 @@
 # firstly and OO about ninthly (if you don't like the design and you can't 
 # improve it with better OO and thus make it smaller and more efficient, then tough). 
 #
-# Copyright (c) 1998-2000 - Dirk Koopman G1TLH
+# Copyright (c) 1998-2016 - Dirk Koopman G1TLH
 #
 #
 #
@@ -171,7 +171,7 @@ sub alloc
 	if (@dxcc > 0) {
 		$self->{dxcc} = $dxcc[1]->dxcc;
 		$self->{itu} = $dxcc[1]->itu;
-		$self->{cq} = $dxcc[1]->cq;						
+		$self->{cq} = $dxcc[1]->cq;
 	}
 	$self->{inqueue} = [];
 
@@ -300,68 +300,68 @@ sub del
 sub is_bbs
 {
 	my $self = shift;
-	return $self->{'sort'} eq 'B';
+	return $self->{sort} eq 'B';
 }
 
 sub is_node
 {
 	my $self = shift;
-	return $self->{'sort'} =~ /[ACRSXW]/;
+	return $self->{sort} =~ /^[ACRSX]$/;
 }
 # is it an ak1a node ?
 sub is_ak1a
 {
 	my $self = shift;
-	return $self->{'sort'} eq 'A';
+	return $self->{sort} eq 'A';
 }
 
 # is it a user?
 sub is_user
 {
 	my $self = shift;
-	return $self->{'sort'} eq 'U';
+	return $self->{sort} =~ /^[UW]$/;
 }
 
 # is it a clx node
 sub is_clx
 {
 	my $self = shift;
-	return $self->{'sort'} eq 'C';
+	return $self->{sort} eq 'C';
 }
 
-# it is Aranea
-sub is_aranea
+# it is a Web connected user
+sub is_web
 {
 	my $self = shift;
-	return $self->{'sort'} eq 'W';
+	return $self->{sort} eq 'W';
 }
 
 # is it a spider node
 sub is_spider
 {
 	my $self = shift;
-	return $self->{'sort'} eq 'S';
+	return $self->{sort} eq 'S';
 }
 
 # is it a DXNet node
 sub is_dxnet
 {
 	my $self = shift;
-	return $self->{'sort'} eq 'X';
+	return $self->{sort} eq 'X';
 }
 
 # is it a ar-cluster node
 sub is_arcluster
 {
 	my $self = shift;
-	return $self->{'sort'} eq 'R';
+	return $self->{sort} eq 'R';
 }
 
 # for perl 5.004's benefit
 sub sort
 {
 	my $self = shift;
-	return @_ ? $self->{'sort'} = shift : $self->{'sort'} ;
+	return @_ ? $self->{sort} = shift : $self->{sort} ;
 }
 
 # find out whether we are prepared to believe this callsign on this interface
@@ -587,7 +587,7 @@ sub decode_input
 {
 	my $dxchan = shift;
 	my $data = shift;
-	my ($sort, $call, $line) = $data =~ /^([A-Z])([A-Z0-9\/\-]{3,25})\|(.*)$/;
+	my ($sort, $call, $line) = $data =~ /^([A-Z])(#?[A-Z0-9\/\-]{3,25})\|(.*)$/;
 
 	my $chcall = (ref $dxchan) ? $dxchan->call : "UN.KNOWN";