merge in build no fix to PC18 from SIMPLEROUTE again

[spider.git] / perl / DXProt.pm

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 1002023c4f9b3980920a49a50d5396bdc4bdd76b..360bb2dd2392c602e788a42e77edee9b0411f4aa 100644 (file)
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -38,12 +38,6 @@ use RouteDB;
 
 use strict;
 
-use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
 use vars qw($pc11_max_age $pc23_max_age $last_pc50 $eph_restime $eph_info_restime $eph_pc34_restime
                        $last_hour $last10 %eph  %pings %rcmds $ann_to_talk
                        $pingint $obscount %pc19list $chatdupeage $chatimportfn
@@ -969,7 +963,7 @@ sub handle_18
        $self->state('init');   
 
        # record the type and version offered
-       if ($_[1] =~ /DXSpider Version: (\d+\.\d+) Build: (\d+\.\d+)/) {
+       if ($_[1] =~ /DXSpider Version: (\d+\.\d+) Build: (\d+(?:\.\d+)?)/) {
                $self->version(53 + $1);
                $self->user->version(53 + $1);
                $self->build(0 + $2);
@@ -1487,6 +1481,10 @@ sub handle_41
        $user = DXUser->new($call) unless $user;
                        
        if ($_[2] == 1) {
+               if (($_[3] =~ /spotter/i || $_[3] =~ /self/i) && $user->name && $user->name ne $_[3]) {
+                       dbg("PCPROT: invalid name") if isdbg('chanerr');
+                       return;
+               }
                $user->name($_[3]);
        } elsif ($_[2] == 2) {
                $user->qth($_[3]);