Change buddy message.

diff --git a/Changes b/Changes
index 35e9a6d39415f7f549350eaf9a09a026f268d6b0..ea6a61ed1fc6ff595ae013c13950a806d29aa4cc 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,5 +1,8 @@
 03Jun06=======================================================================
-1. Added changes from Jim AD1C. 
+1. Added changes to wpxloc.raw (prefixes) suggested by Jim AD1C. 
+2. Made a change to prevent xml data being interpreted unless we are
+configured for it.
+3. Change the buddy messages after a suggestion from Angel EA7WA.
 02Apr06=======================================================================
 1. incorporated cty-1604 data.
 29Mar06=======================================================================

diff --git a/perl/DXChannel.pm b/perl/DXChannel.pm
index 929e7e530183ed71d62be1c2e4b9ff4701d122ed..127f3a0604665e6631784dbc8a871253f72cfb95 100644 (file)
--- a/perl/DXChannel.pm
+++ b/perl/DXChannel.pm
@@ -517,7 +517,7 @@ sub tell_buddies
        
        $call ||= $self->{call};
        $call =~ s/-\d+$//;
-       my $s = $node ? "$node: $call" : $call;
+       $m .= 'n' if $node;
        
        # send info to all logged in thingies
        my @dxchan = get_all_users();
@@ -525,7 +525,7 @@ sub tell_buddies
        foreach $dxchan (@dxchan) {
                next if $dxchan == $self;
                next if $dxchan->{call} eq $main::mycall;
-               $dxchan->send($dxchan->msg($m, $s)) if grep $_ eq $call, @{$dxchan->{user}->{buddies}} ;
+               $dxchan->send($dxchan->msg($m, $call, $node)) if grep $_ eq $call, @{$dxchan->{user}->{buddies}} ;
        }
 }
 

diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index ea99e3d147e277e9af8c4d9b3b8fd4b2dcc04687..7500d17de8bce5ed5ad51e00218350ce50463cfe 100644 (file)
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -215,8 +215,7 @@ sub start
                my $ref = Route::User::get($call);
                if ($ref) {
                        foreach my $node (@{$ref->parent}) {
-                               my $s = $node eq $main::mycall ? $call : "$node: $call";
-                               $self->send($self->msg('loginb', $s));
+                               $self->send($self->msg($node eq $main::mycall ? 'loginb' : 'loginbn', $call, $node));
                        } 
                }
        }

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 53ca8ea37131662cbc0e3583e510c240eace6905..143b71e48e4a98c0ff141479aa76f1b73efb96a9 100644 (file)
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -333,7 +333,7 @@ sub normal
 {
        my ($self, $line) = @_;
 
-       if ($line =~ '^<\w+\s') {
+       if ($line =~ '^<\w+\s' && $main::do_xml) {
                DXXml::normal($self, $line);
                return;
        }

diff --git a/perl/Messages b/perl/Messages
index 0c667054073d08990fdde1676fb5c7abc5eebe4c..e8a310876df1e5522479b5c53b946b28c51e50ef 100644 (file)
--- a/perl/Messages
+++ b/perl/Messages
@@ -168,7 +168,9 @@ package DXM;
                                lockoutun => '$_[0] Unlocked',
                                lockoutuse => 'usage: sh/lockout <call>|ALL',
                                loginb => 'Buddy $_[0] has logged in',
+                               loginbn => 'Buddy $_[0] has logged in at $_[1]',
                                logoutb => 'Buddy $_[0] has logged out',
+                               logoutbn => 'Buddy $_[0] has logged out from $_[1]',
                                loginu => 'User $_[0] has logged in',
                                logoutu => 'User $_[0] has logged out',
                                loginn => 'Node $_[0] has logged in',