allow 't <call>' for swopping from announces as well

diff --git a/Changes b/Changes
index 071292191a6e9c305825b0fd3a1184372c72d0ea..29408d1958ef13bdea61d48f0335c0682552fc2a 100644 (file)
--- a/Changes
+++ b/Changes
@@ -4,8 +4,9 @@
 data (eg at init time with large lists of node/users on fast links).
 3. fixed realtime input filter changing.
 4. added announce->talk conversion for routable calls when announces of the
-form 'to g1tlh hello' or 'g1tlh hello' appear. This also suppresses similar
-announces for users whose callsign is not the one in the announce.
+form 'to g1tlh hello', 't g1tlh hello'  or 'g1tlh hello' appear. 
+This also suppresses similar announces for users whose callsign is not the 
+one in the announce.
 11Sep01=======================================================================
 1. added IP address logging of connections
 10Sep01=======================================================================

diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index 18367bdfa76982c2b207cdc27b77b5bf1f75ba83..6986a41aa60b1d8188dbc06d7ce4715a32eb35c1 100644 (file)
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -707,7 +707,7 @@ sub announce
 
        if ($suppress_ann_to_talk) {
                my ($to, $call) = $text =~ /^\s*([\w-]+)[\s:]+([\w-]+)/;
-               return if ($to && $call && ((uc $to eq 'TO' && is_callsign(uc $call)) || is_callsign($call = uc $to)));
+               return if ($to && $call && ((uc $to =~ /^TO?$/ && is_callsign(uc $call)) || is_callsign($call = uc $to)));
        }       
 
        if ($self->{annfilter}) {

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 02e3d3a80319741db555289dab5d85b8bc9b32bc..153618f9dc182f6a33bd1ee238130f121eef7bde 100644 (file)
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -522,7 +522,9 @@ sub normal
                                if ($ann_to_talk) {
                                        my ($to, $call) = $field[3] =~ /^\s*([\w-]+)[\s:]+([\w-]+)/;
                                        if ($to && $call) {
-                                               if ((uc $to eq 'TO' && is_callsign(uc $call)) || is_callsign($call = uc $to)) {
+                                               $to = uc $to;
+                                               $call = uc $call;
+                                               if (($to =~ /^TO?$/ && is_callsign($call)) || is_callsign($call = $to)) {
                                                        my $ref = Route::get($call);
                                                        if ($ref) {
                                                                my $dxchan = $ref->dxchan;