From: minima <minima>
Date: Sat, 8 Mar 2003 10:01:32 +0000 (+0000)
Subject: change place of chat target in pc12
X-Git-Tag: PRE-1-52~36
X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=e74346e7fcfcf7b825534727904adf57425aadd1;p=spider.git

change place of chat target in pc12
---

diff --git a/cmd/chat.pl b/cmd/chat.pl
index 4062358c..545c7c78 100644
--- a/cmd/chat.pl
+++ b/cmd/chat.pl
@@ -38,6 +38,6 @@ if (@bad = BadWords::check($line)) {
 my $msgid = DXProt::nextchatmsgid();
 $text = "#$msgid $text";
 
-DXProt::send_chat($self, DXProt::pc12($from, $text, $target), $from, $target, $text, ' ', $main::mycall, '0');
+DXProt::send_chat($self, DXProt::pc12($from, $text, '*', $target), $from, $target, $text, ' ', $main::mycall, '0');
 
 return (1, ());
diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index 65d5eb03..5a53dc6e 100644
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -813,10 +813,10 @@ sub chat
 	my $text = shift;
 	my ($filter, $hops);
 
-	return unless grep uc $_ eq $target, @{$self->{user}->{group}};
+	return unless grep uc $_ eq $to, @{$self->{user}->{group}};
 	
 	$text =~ s/^\#\d+ //;
-	my $buf = "$target de $_[0]: $text";
+	my $buf = "$to de $_[0]: $text";
 	$buf =~ s/\%5E/^/g;
 	$buf .= "\a\a" if $self->{beep};
 	$self->local_send('C', $buf);
diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 5ddafa5e..26a36548 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -76,7 +76,7 @@ $chatdupeage = 20 * 60 * 60;
 (
  [ qw(c c m bp bc c) ],			# pc10
  [ qw(f m d t m c c h) ],		# pc11
- [ qw(c m m bp bm p h) ],		# pc12
+ [ qw(c bm m bp bm p h) ],		# pc12
  [ qw(c h) ],					# 
  [ qw(c h) ],					# 
  [ qw(c m h) ],					# 
@@ -626,7 +626,7 @@ sub handle_12
 	
 		# send it
 		$self->send_announce($line, @_[1..6]);
-	} elsif ((($dxchan = DXChannel->get($_[2])) && $dxchan->is_user) || !is_callsign($_[0])){
+	} elsif ((($dxchan = DXChannel->get($_[2])) && $dxchan->is_user) || $_[4] =~ /^[\#\w]+$/){
 		$self->send_chat($line, @_[1..6]);
 	} else {
 		$self->route($_[2], $line);
@@ -1790,7 +1790,7 @@ sub send_chat
 	my $line = shift;
 	my @dxchan = DXChannel->get_all();
 	my $dxchan;
-	my $target = $_[1];
+	my $target = $_[3];
 	my $text = unpad($_[2]);
 				
 	# obtain country codes etc 
@@ -1836,7 +1836,7 @@ sub send_chat
 		next if $dxchan == $main::me;
 		next if $dxchan == $self && $self->is_node;
 		next if $target eq 'LOCAL' && $dxchan->is_node;
-		$dxchan->chat($line, $self->{isolate}, ' ', $target, $text, @_, $self->{call}, $ann_dxcc, $ann_itu, $ann_cq, $org_dxcc, $org_itu, $org_cq);
+		$dxchan->chat($line, $self->{isolate}, $target, $_[1], $text, @_, $self->{call}, $ann_dxcc, $ann_itu, $ann_cq, $org_dxcc, $org_itu, $org_cq);
 	}
 }