X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXCommandmode.pm;h=d8f6eb54d6bbb7ab61b603b058ac5b71da874d49;hb=3f1c5ab45aa13e99da6bea0bfcc6d4434beb5871;hp=ab82d904e9ba1eb5d1279f6303eaac4ae8869548;hpb=8e45a3dac2e136dc0c9d6f1e78f8c048a8d7ba21;p=spider.git

diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index ab82d904..d8f6eb54 100644
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -180,10 +180,7 @@ sub normal
 	} elsif ($self->{state} eq 'talk') {
 		if ($cmdline =~ m{^(?:/EX|/ABORT)}i) {
 			for (@{$self->{talklist}}) {
-				my $ent = $_;
-				my ($to, $via) = $ent =~ /(\S+)>(\S+)/;
-				my $dxchan = DXChannel->get($via);
-				$dxchan->talk($self->{call}, $to, $via, $self->msg('talkend')) if $dxchan;
+				$self->send_talks($_,  $self->msg('talkend'));
 			}
 			$self->state('prompt');
 			delete $self->{talklist};
@@ -194,21 +191,7 @@ sub normal
 		} elsif ($self->{talklist} && @{$self->{talklist}}) {
 			# send what has been said to whoever is in this person's talk list
 			for (@{$self->{talklist}}) {
-				my $ent = $_;
-				my ($to, $via) = $ent =~ /(\S+)>(\S+)/;
-				my $dxchan = DXChannel->get($via);
-				if ($dxchan && DXCluster->get_exact($to)) {
-					$dxchan->talk($self->{call}, $to, $via, $cmdline);
-				} else {
-					$self->send($self->msg('disc2', $via ? $via : $to));
-					my @l = grep { $_ ne $ent } @{$self->{talklist}};
-					if (@l) {
-						$self->{talklist} = \@l;
-					} else {
-						delete $self->{talklist};
-						$self->state('prompt');
-					}
-				}
+				$self->send_talks($_, $cmdline);
 			}
 			$self->send($self->talk_prompt) if $self->{state} eq 'talk';
 		} else {
@@ -223,12 +206,37 @@ sub normal
 	$self->prompt() if $self->{state} =~ /^prompt/o;
 }
 
+# send out the talk messages taking into account vias and connectivity
+sub send_talks
+{
+	my ($self, $ent, $line) = @_;
+	
+	my ($to, $via) = $ent =~ /(\S+)>(\S+)/;
+	$to = $ent unless $to;
+	my $call = $via ? $via : $to;
+	my $clref = DXCluster->get_exact($call);
+	my $dxchan = $clref->dxchan if $clref;
+	if ($dxchan) {
+		$dxchan->talk($self->{call}, $to, $via, $line);
+	} else {
+		$self->send($self->msg('disc2', $via ? $via : $to));
+		my @l = grep { $_ ne $ent } @{$self->{talklist}};
+		if (@l) {
+			$self->{talklist} = \@l;
+		} else {
+			delete $self->{talklist};
+			$self->state('prompt');
+		}
+	}
+}
+
 sub talk_prompt
 {
 	my $self = shift;
 	my @call;
 	for (@{$self->{talklist}}) {
 		my ($to, $via) = /(\S+)>(\S+)/;
+		$to = $_ unless $to;
 		push @call, $to;
 	}
 	return $self->msg('talkprompt', join(',', @call));
@@ -250,7 +258,7 @@ sub send_ans
 			$line =~ s/\s+$//o;	# why am having to do this? 
 			$self->send($line);
 		}
-		$self->{pagedata} =  \@_;
+		$self->{pagedata} =  [ @_ ];
 		$self->state('page');
 		$self->send($self->msg('page', scalar @_));
 	} else {