Change DXUser->get* to DXUser::get*

and also check the output of thaw more carefully, complain if it
isn't a DXUser.

diff --git a/Changes b/Changes
index c97a6e5c9829f02abb70cc3335b8122ef0ef94e0..66f67086772f56f83c982edf8430e53ac4c3f4b1 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,3 +1,7 @@
+06May08=======================================================================
+1. Finally made the incompatible change of changing DXUser->get* to
+DXUser::get*. This will break any third party addons or commands use these
+commands.
 22Apr08=======================================================================
 1. Added two Xmas Is calls.
 15Apr08=======================================================================

diff --git a/cmd/Notes.txt b/cmd/Notes.txt
index c058941bc516b8a655fe174d579e64e2cb1865e1..4e23e1306b4766c82d8f5be07b060b945a849254 100644 (file)
--- a/cmd/Notes.txt
+++ b/cmd/Notes.txt
@@ -1,4 +1,4 @@
-Programming Notes ($Id$)
+Programming Notes
 
 * Every command that can used on the command line lives in either this
   directory ('cmd') or in a local version ('local_cmd'). You are cajoled or
@@ -98,7 +98,7 @@ Programming Notes ($Id$)
                               locators
 
 * It is important that you remember when you have tie hashes using MLDBM
-  et al. If you do a DXUser->get($call) you will get a different (older)
+  et al. If you do a DXUser::get($call) you will get a different (older)
   thing than the one in $self->$user. This is almost certainly NOT what
   you want if want to modify a user that is currently connected.
 

diff --git a/cmd/catchup.pl b/cmd/catchup.pl
index 81bf0539370d68384d332979308cd93290786838..2bf0d5e7bee9dae0c361be32e3f639eeb00c4df2 100644 (file)
--- a/cmd/catchup.pl
+++ b/cmd/catchup.pl
@@ -16,7 +16,7 @@ my @f = split /\s+/, $line;
 return (1, "usage: catchup <node call> all|[<msgno ...]") unless @f >= 2;
 
 my $call = uc shift @f;
-my $user = DXUser->get_current($call);
+my $user = DXUser::get_current($call);
 return (1, "$call not a node") unless $user && $user->sort ne 'U';
 
 my @out;

diff --git a/cmd/clear/announce.pl b/cmd/clear/announce.pl
index 9abee68b395ae934fdd25682cab192d2e3e8bf57..7e41c475b80e2f0ee0a010add1d7e3011d5bdbed 100644 (file)
--- a/cmd/clear/announce.pl
+++ b/cmd/clear/announce.pl
@@ -18,7 +18,7 @@ my $f;
 if ($self->priv >= 8) {
        if (@f && is_callsign(uc $f[0])) {
                $f = uc shift @f;
-               my $uref = DXUser->get($f);
+               my $uref = DXUser::get($f);
                $call = $uref->call if $uref;
        } elsif (@f && lc $f[0] eq 'node_default' || lc $f[0] eq 'user_default') {
                $call = lc shift @f;

diff --git a/cmd/clear/route.pl b/cmd/clear/route.pl
index 403a777aec46bfa2c24955059cb8cbc9c1e8a089..f7ab802a5fe72f1e8f9e04ef79d6628604d8b218 100644 (file)
--- a/cmd/clear/route.pl
+++ b/cmd/clear/route.pl
@@ -18,7 +18,7 @@ my $f;
 if ($self->priv >= 8) {
        if (@f && is_callsign(uc $f[0])) {
                $f = uc shift @f;
-               my $uref = DXUser->get($f);
+               my $uref = DXUser::get($f);
                $call = $uref->call if $uref;
        } elsif (@f && lc $f[0] eq 'node_default' || lc $f[0] eq 'user_default') {
                $call = lc shift @f;

diff --git a/cmd/clear/spots.pl b/cmd/clear/spots.pl
index 5ba0c8de595150d22358da773f348d5e2588d6a8..a7aa20af36bacfe054b3b66a17dfd7c66e8b637c 100644 (file)
--- a/cmd/clear/spots.pl
+++ b/cmd/clear/spots.pl
@@ -18,7 +18,7 @@ my $f;
 if ($self->priv >= 8) {
        if (@f && is_callsign(uc $f[0])) {
                $f = uc shift @f;
-               my $uref = DXUser->get($f);
+               my $uref = DXUser::get($f);
                $call = $uref->call if $uref;
        } elsif (@f && lc $f[0] eq 'node_default' || lc $f[0] eq 'user_default') {
                $call = lc shift @f;

diff --git a/cmd/clear/wcy.pl b/cmd/clear/wcy.pl
index fe9583ef86bb902407bc3b2f12b4f6d233df29f5..68706046182f0f74a7466f6ac5d14b3eab98b0b8 100644 (file)
--- a/cmd/clear/wcy.pl
+++ b/cmd/clear/wcy.pl
@@ -18,7 +18,7 @@ my $f;
 if ($self->priv >= 8) {
        if (@f && is_callsign(uc $f[0])) {
                $f = uc shift @f;
-               my $uref = DXUser->get($f);
+               my $uref = DXUser::get($f);
                $call = $uref->call if $uref;
        } elsif (@f && lc $f[0] eq 'node_default' || lc $f[0] eq 'user_default') {
                $call = lc shift @f;

diff --git a/cmd/clear/wwv.pl b/cmd/clear/wwv.pl
index 0d52f5c8263de7e454040a62aedfcb9608ab4a68..8201eb47ec020b4ba3b462e5035f4d5e8a6dddbd 100644 (file)
--- a/cmd/clear/wwv.pl
+++ b/cmd/clear/wwv.pl
@@ -18,7 +18,7 @@ my $f;
 if ($self->priv >= 8) {
        if (@f && is_callsign(uc $f[0])) {
                $f = uc shift @f;
-               my $uref = DXUser->get($f);
+               my $uref = DXUser::get($f);
                $call = $uref->call if $uref;
        } elsif (@f && lc $f[0] eq 'node_default' || lc $f[0] eq 'user_default') {
                $call = lc shift @f;

diff --git a/cmd/connect.pl b/cmd/connect.pl
index 240029859fef470973e4b499e40705b61863e613..fd893974bb3673dfd87b921f1833afc7749a5a0d 100644 (file)
--- a/cmd/connect.pl
+++ b/cmd/connect.pl
@@ -11,7 +11,7 @@ return (1, $self->msg('already', $call)) if DXChannel::get($call);
 return (1, $self->msg('outconn', $call)) if grep {$_->{call} eq $call} @main::outstanding_connects;
 return (1, $self->msg('conscript', $lccall)) unless -e "$main::root/connect/$lccall";
 
-my $user = DXUser->get($call);
+my $user = DXUser::get($call);
 return (1, $self->msg('lockout', $call)) if $user && $user->lockout;
 
 my @out;

diff --git a/cmd/create/user.pl b/cmd/create/user.pl
index 4eeece8a38397f9d0ccc53b232eadac7b1ad8741..3b30f2fff33af6dd6c576e7d959ea8bbf4fc1c3e 100644 (file)
--- a/cmd/create/user.pl
+++ b/cmd/create/user.pl
@@ -19,7 +19,7 @@ return (1, $self->msg('e5')) if $self->priv < 9 || $self->remotecmd;
 
 foreach $call (@args) {
        $call = uc $call;
-       $user = DXUser->get($call);
+       $user = DXUser::get($call);
        unless ($user) {
                $user = DXUser->new($call);
                $user->sort('U');

diff --git a/cmd/delete/user.pl b/cmd/delete/user.pl
index 2dc60db9014cea28dcd3181f09aab9d421b919c2..27065d986cf84f4fae1fdd708385b638d81389e9 100644 (file)
--- a/cmd/delete/user.pl
+++ b/cmd/delete/user.pl
@@ -22,7 +22,7 @@ foreach $call (@args) {
        if ($chan) {
                push @out, $self->msg('nodee1', $call);
        } else {
-               $user = DXUser->get($call);
+               $user = DXUser::get($call);
                if ($user) {
                        $user->del;
                        push @out, $self->msg('deluser', $call);

diff --git a/cmd/forward/latlong.pl b/cmd/forward/latlong.pl
index 2282be3cce01e43e53b9147bd75cea0ec177a208..e9afd71014e6e1913f998cdd802cfe4abeb2e69a 100644 (file)
--- a/cmd/forward/latlong.pl
+++ b/cmd/forward/latlong.pl
@@ -29,7 +29,7 @@ use DB_File;
 my ($action, $count, $key, $data);
 for ($action = R_FIRST, $count = 0; !$DXUser::dbm->seq($key, $data, $action); $action = R_NEXT) {
        if ($data =~ m{(?:lat|long) =>}) {
-               my $u = DXUser->get_current($key);
+               my $u = DXUser::get_current($key);
                if ($u) {
                        my $lat = $u->lat;
                        my $long = $u->long;

diff --git a/cmd/forward/opername.pl b/cmd/forward/opername.pl
index 91acc8b4c9eb173be8a8ecae1fca7897e033682b..08333724dcd251233635828b602483251e16b4c6 100644 (file)
--- a/cmd/forward/opername.pl
+++ b/cmd/forward/opername.pl
@@ -22,7 +22,7 @@ if ($self->priv < 1) {
 
 my $call;
 foreach $call (@f) {
-       my $ref = DXUser->get_current($call);
+       my $ref = DXUser::get_current($call);
        if ($ref) {
                my $name = $ref->name;  
                my $qth = $ref->qth;

diff --git a/cmd/set/arcluster.pl b/cmd/set/arcluster.pl
index cfed97ab5651e38b37aae8b143a3119dda0c6d35..1587f70337c2fdbd439f3b8c8459ac59446de04b 100644 (file)
--- a/cmd/set/arcluster.pl
+++ b/cmd/set/arcluster.pl
@@ -23,7 +23,7 @@ foreach $call (@args) {
        if ($chan) {
                push @out, $self->msg('nodee1', $call);
        } else {
-               $user = DXUser->get($call);
+               $user = DXUser::get($call);
                $create = !$user;
                $user = DXUser->new($call) if $create;
                if ($user) {

diff --git a/cmd/set/bbs.pl b/cmd/set/bbs.pl
index d0960a30b6f56b49fcd5aeb5c2689480f9b883da..8709dcd06646786a3766406cb607964b89c4b22f 100644 (file)
--- a/cmd/set/bbs.pl
+++ b/cmd/set/bbs.pl
@@ -23,7 +23,7 @@ foreach $call (@args) {
        if ($chan) {
                push @out, $self->msg('nodee1', $call);
        } else {
-               $user = DXUser->get($call);
+               $user = DXUser::get($call);
                $create = !$user;
                $user = DXUser->new($call) if $create;
                if ($user) {

diff --git a/cmd/set/believe.pl b/cmd/set/believe.pl
index 95d776c32f52eb638fd9a5626c79c8d6dbdbd44d..479aa92020aac411f3c818bc1908982bfc85b620 100644 (file)
--- a/cmd/set/believe.pl
+++ b/cmd/set/believe.pl
@@ -15,13 +15,13 @@ my @nodes;
 
 return (1, $self->msg('e5')) if $self->priv < 6;
 return (1, $self->msg('e22', $node)) unless is_callsign($node);
-my $user = DXUser->get_current($node);
+my $user = DXUser::get_current($node);
 return (1, $self->msg('e13', $node)) unless $user->is_node;
 
 foreach $call (@args) {
        return (1, $self->msg('e22', $node)) unless is_callsign($call);
 
-       my $u = DXUser->get_current($call);
+       my $u = DXUser::get_current($call);
        if ($u->is_node) {
                        push @nodes, $call;
        } else {

diff --git a/cmd/set/clx.pl b/cmd/set/clx.pl
index f27174add4d6540120e066d9adb781fa209f4ff8..eaead5ab22e0637e7250a1020e0848a82dbd591e 100644 (file)
--- a/cmd/set/clx.pl
+++ b/cmd/set/clx.pl
@@ -23,7 +23,7 @@ foreach $call (@args) {
        if ($chan) {
                push @out, $self->msg('nodee1', $call);
        } else {
-               $user = DXUser->get($call);
+               $user = DXUser::get($call);
                $create = !$user;
                $user = DXUser->new($call) if $create;
                if ($user) {

diff --git a/cmd/set/dxcq.pl b/cmd/set/dxcq.pl
index 89c1a9c7e539d4b62066ca8b1830795f7620fbd1..bfe40760692a565c442a16b52e737fea73266339 100644 (file)
--- a/cmd/set/dxcq.pl
+++ b/cmd/set/dxcq.pl
@@ -15,7 +15,7 @@ my @out;
 
 foreach $call (@args) {
        $call = uc $call;
-       my $user = DXUser->get_current($call);
+       my $user = DXUser::get_current($call);
        if ($user) {
                $user->wantdxcq(1);
                if ($user->wantdxitu) {

diff --git a/cmd/set/dxgrid.pl b/cmd/set/dxgrid.pl
index 0dfd29dd73550b6b8ed769a3a4706844cdd50ba6..8a2798b86ca3d42c191298a2fe6453129bb4ab0f 100644 (file)
--- a/cmd/set/dxgrid.pl
+++ b/cmd/set/dxgrid.pl
@@ -15,7 +15,7 @@ my @out;
 
 foreach $call (@args) {
        $call = uc $call;
-       my $user = DXUser->get_current($call);
+       my $user = DXUser::get_current($call);
        if ($user) {
                $user->wantgrid(1);
                $user->put;

diff --git a/cmd/set/dxitu.pl b/cmd/set/dxitu.pl
index 45e07497217a6c76c454453b834e223273c2b76e..0e002ba748fe99a70980deef98a3d1b87f76ef4c 100644 (file)
--- a/cmd/set/dxitu.pl
+++ b/cmd/set/dxitu.pl
@@ -15,7 +15,7 @@ my @out;
 
 foreach $call (@args) {
        $call = uc $call;
-       my $user = DXUser->get_current($call);
+       my $user = DXUser::get_current($call);
        if ($user) {
                $user->wantdxitu(1);
                if ($user->wantdxcq) {

diff --git a/cmd/set/dxnet.pl b/cmd/set/dxnet.pl
index 2d184adb16a9763a3e3d0cc607e80475270b8c82..6d2011364cacb64e429591baf72c900b91516301 100644 (file)
--- a/cmd/set/dxnet.pl
+++ b/cmd/set/dxnet.pl
@@ -23,7 +23,7 @@ foreach $call (@args) {
        if ($chan) {
                push @out, $self->msg('nodee1', $call);
        } else {
-               $user = DXUser->get($call);
+               $user = DXUser::get($call);
                $create = !$user;
                $user = DXUser->new($call) if $create;
                if ($user) {

diff --git a/cmd/set/email.pl b/cmd/set/email.pl
index ac6c991cdd7682a413bf240ec3bb8f837eb5872b..c5bfe52bdd740d9891df5d1290d569b91294edc4 100644 (file)
--- a/cmd/set/email.pl
+++ b/cmd/set/email.pl
@@ -15,7 +15,7 @@ my @f = split /\s+/, $line;
 
 return (1, $self->msg('emaile1')) if !$line;
 
-$user = DXUser->get_current($call);
+$user = DXUser::get_current($call);
 if ($user) {
        $user->email(\@f);
        $user->wantemail(1);

diff --git a/cmd/set/homebbs.pl b/cmd/set/homebbs.pl
index 72a48f0a130d553bd5c7ce34ed48cbfe3b17e288..ca563975313a51d78f52361bca05fabd5742bb86 100644 (file)
--- a/cmd/set/homebbs.pl
+++ b/cmd/set/homebbs.pl
@@ -16,7 +16,7 @@ $line =~ s/\s+$//;
 
 return (1, $self->msg('bbse1')) if !$line;
 
-$user = DXUser->get_current($call);
+$user = DXUser::get_current($call);
 if ($user) {
        $line = uc $line;
        $user->bbs($line);

diff --git a/cmd/set/homenode.pl b/cmd/set/homenode.pl
index a643bed7b094ada5674035640cd3a15d7dd6b7ce..605c0c21063f4b9c07771542edf508e4bba3a95e 100644 (file)
--- a/cmd/set/homenode.pl
+++ b/cmd/set/homenode.pl
@@ -17,7 +17,7 @@ $line =~ s/[{}]//g;   # no braces allowed
 
 return (1, $self->msg('hnodee1')) if !$line;
 
-$user = DXUser->get_current($call);
+$user = DXUser::get_current($call);
 if ($user) {
        $line = uc $line;
        $user->homenode($line);

diff --git a/cmd/set/isolate.pl b/cmd/set/isolate.pl
index 90de6683165cdde1bace1fe8d4f4bd0bfbefcf9d..893c204ca0f4397ad8609be5f956acc89795973c 100644 (file)
--- a/cmd/set/isolate.pl
+++ b/cmd/set/isolate.pl
@@ -23,7 +23,7 @@ foreach $call (@args) {
        if ($chan) {
                push @out, $self->msg('nodee1', $call);
        } else {
-               $user = DXUser->get($call);
+               $user = DXUser::get($call);
                $create = !$user;
                $user = DXUser->new($call) if $create;
                my $f;

diff --git a/cmd/set/language.pl b/cmd/set/language.pl
index 8429a3849300e06ec60aaaa92fe2bbb26ac71b3b..5c85b303419de3a35b92f8ff0f1243f9030f3f5f 100644 (file)
--- a/cmd/set/language.pl
+++ b/cmd/set/language.pl
@@ -22,7 +22,7 @@ $line = lc $line;
 return (1, $self->msg('lange1', join(',', @lang))) unless grep $_ eq $line, @lang;
 
 
-$user = DXUser->get_current($call);
+$user = DXUser::get_current($call);
 if ($user) {
        $user->lang($line);
        $user->put();

diff --git a/cmd/set/local_node.pl b/cmd/set/local_node.pl
index b221c881556910e0e84ae22e72262c3247d4af19..0605c959744177be61b3669ad7ca2581852009b1 100644 (file)
--- a/cmd/set/local_node.pl
+++ b/cmd/set/local_node.pl
@@ -13,7 +13,7 @@ my @out;
 return (1, $self->msg('e5')) unless $self->priv >= 5;
 
 foreach my $call (@args) {
-       my $user = DXUser->get_current($call);
+       my $user = DXUser::get_current($call);
        push(@out, $self->msg('e3', 'set/localnode', $call)), next unless $user; 
        push(@out, $self->msg('e13', $call)), next unless $user->is_node; 
        my $group = $user->group || [];

diff --git a/cmd/set/location.pl b/cmd/set/location.pl
index 1e758f81d08f4af7b6307949bd2d71b3c17c0e4a..834ce613d164bdac8737e76a528d237c8d21e847 100644 (file)
--- a/cmd/set/location.pl
+++ b/cmd/set/location.pl
@@ -18,7 +18,7 @@ return (1, $self->msg('loce1')) if !$line;
 return (1, $self->msg('loce3', uc $line)) if is_qra($line);
 return (1, $self->msg('loce2', $line)) unless is_latlong($line);
 
-$user = DXUser->get_current($call);
+$user = DXUser::get_current($call);
 if ($user) {
        $line = uc $line;
        my ($lat, $long) = DXBearing::stoll($line);

diff --git a/cmd/set/lockout.pl b/cmd/set/lockout.pl
index ac7cc83a5d11a15afc33c39b5919ef8aa33b4f99..feb326eb77b5b761cd47fe51533b940f2392bef3 100644 (file)
--- a/cmd/set/lockout.pl
+++ b/cmd/set/lockout.pl
@@ -21,7 +21,7 @@ if ($self->priv < 9) {
 foreach $call (@args) {
        $call = uc $call;
        unless ($self->remotecmd || $self->inscript) {
-               if ($ref = DXUser->get_current($call)) {
+               if ($ref = DXUser::get_current($call)) {
                        $ref->lockout(1);
                        $ref->put();
                        push @out, $self->msg("lockout", $call);

diff --git a/cmd/set/name.pl b/cmd/set/name.pl
index b8dd3150495651f24a97b045d50f9222dbb9ab37..4fae3e16f333546e362e85b93a722acb6252e2ad 100644 (file)
--- a/cmd/set/name.pl
+++ b/cmd/set/name.pl
@@ -17,7 +17,7 @@ $line =~ s/[{}]//g;   # no braces allowed
 
 return (1, $self->msg('namee1')) if !$line;
 
-$user = DXUser->get_current($call);
+$user = DXUser::get_current($call);
 if ($user) {
        $user->name($line);
        $user->put();

diff --git a/cmd/set/node.pl b/cmd/set/node.pl
index 82e8be11f9d90b0dcd127fdcc064ef834a087c48..8a1f811170eb7baec3fc02940665dfeb67ad5197 100644 (file)
--- a/cmd/set/node.pl
+++ b/cmd/set/node.pl
@@ -23,7 +23,7 @@ foreach $call (@args) {
        if ($chan) {
                push @out, $self->msg('nodee1', $call);
        } else {
-               $user = DXUser->get($call);
+               $user = DXUser::get($call);
                $create = !$user;
                $user = DXUser->new($call) if $create;
                if ($user) {

diff --git a/cmd/set/obscount.pl b/cmd/set/obscount.pl
index 1e9b53b5d45e64d3e0c28504eca7ab7ef588e602..1bf73e2d915d41adb051c71b30c29592d1326f63 100644 (file)
--- a/cmd/set/obscount.pl
+++ b/cmd/set/obscount.pl
@@ -22,7 +22,7 @@ foreach $call (@args) {
        $call = uc $call;
        my $dxchan = DXChannel::get($call);
        $user = $dxchan->user if $dxchan;
-       $user = DXUser->get_current($call);
+       $user = DXUser::get_current($call);
        if ($user) {
                unless ($user->is_node) {
                        push @out, $self->msg('e13', $call);

diff --git a/cmd/set/passphrase.pl b/cmd/set/passphrase.pl
index 9cd270c61cb697053984667fd399da120a603676..7e6b743f516183ef1cb9adf375aca9592dff3815 100644 (file)
--- a/cmd/set/passphrase.pl
+++ b/cmd/set/passphrase.pl
@@ -25,7 +25,7 @@ if ($call) {
                return (1, $self->msg('e5'));
        }
        return (1, $self->msg('e29')) unless @args;
-       if ($ref = DXUser->get_current($call)) {
+       if ($ref = DXUser::get_current($call)) {
                $ref->passphrase($args[0]);
                $ref->put();
                push @out, $self->msg("passphrase", $call);

diff --git a/cmd/set/password.pl b/cmd/set/password.pl
index 3a1dc242480cc9c58a6ce5ed3559b69b254cbe2a..9366c0bb5e6b15b0728ddaff801d44d99456867f 100644 (file)
--- a/cmd/set/password.pl
+++ b/cmd/set/password.pl
@@ -26,7 +26,7 @@ if ($call) {
                return (1, $self->msg('e5'));
        }
        return (1, $self->msg('e29')) unless @args;
-       if ($ref = DXUser->get_current($call)) {
+       if ($ref = DXUser::get_current($call)) {
                $ref->passwd($args[0]);
                $ref->put();
                push @out, $self->msg("password", $call);

diff --git a/cmd/set/pinginterval.pl b/cmd/set/pinginterval.pl
index 33131cc58ca2386c46616bd2f963838d8a349cdd..4d215747f48f4e7597a3e447b7ef0cb7b73b0eea 100644 (file)
--- a/cmd/set/pinginterval.pl
+++ b/cmd/set/pinginterval.pl
@@ -34,7 +34,7 @@ foreach $call (@args) {
        $call = uc $call;
        my $dxchan = DXChannel::get($call);
        $user = $dxchan->user if $dxchan;
-       $user = DXUser->get($call) unless $user;
+       $user = DXUser::get($call) unless $user;
        if ($user) {
                unless ($user->is_node) {
                        push @out, $self->msg('e13', $call);

diff --git a/cmd/set/privilege.pl b/cmd/set/privilege.pl
index 183c101b948cea8ebd8c9458d8f58b5524f94673..865819e7efcfb5c6232bd69ddd7eae163484990a 100644 (file)
--- a/cmd/set/privilege.pl
+++ b/cmd/set/privilege.pl
@@ -32,7 +32,7 @@ foreach $call (@args) {
                        $ref->user->priv($priv);
                        $ref->user->put();
                }
-               if (!$ref && ($user = DXUser->get($call))) {
+               if (!$ref && ($user = DXUser::get($call))) {
                        $user->priv($priv);
                        $user->put();
                }

diff --git a/cmd/set/prompt.pl b/cmd/set/prompt.pl
index 3ff1291ee439444341cf3da87da507928c3b5f2c..610456721f7befaea8bcab44e48d75a4b04b8911 100644 (file)
--- a/cmd/set/prompt.pl
+++ b/cmd/set/prompt.pl
@@ -16,7 +16,7 @@ $line =~ s/\s+$//;
 
 return (1, $self->msg('e9')) if !$line;
 
-$user = DXUser->get_current($call);
+$user = DXUser::get_current($call);
 if ($user) {
        $user->prompt($line);
        $self->{prompt} = $line;    # this is like this because $self->prompt is a function that does something else

diff --git a/cmd/set/qra.pl b/cmd/set/qra.pl
index e4c4edcb2ad679c50c0cf1efe37e55f63d8b7746..96000de4ced32603a0b8433d2485f7d1eaf97e08 100644 (file)
--- a/cmd/set/qra.pl
+++ b/cmd/set/qra.pl
@@ -17,7 +17,7 @@ $line =~ s/\s+$//;
 return (1, $self->msg('qrae1')) if !$line;
 return (1, $self->msg('qrae2', $line)) unless is_qra($line);
 
-$user = DXUser->get_current($call);
+$user = DXUser::get_current($call);
 if ($user) {
        my $qra = uc $line;
        my $oldqra = $user->qra || "";

diff --git a/cmd/set/qth.pl b/cmd/set/qth.pl
index 03c5c8499823883dd31d7a26ce86406036ae7747..84462f0c3a58a3d363be66753aac395bc21b4d0c 100644 (file)
--- a/cmd/set/qth.pl
+++ b/cmd/set/qth.pl
@@ -17,7 +17,7 @@ $line =~ s/[{}]//g;   # no braces allowed
 
 return (1, $self->msg('qthe1')) if !$line;
 
-$user = DXUser->get_current($call);
+$user = DXUser::get_current($call);
 if ($user) {
        $user->qth($line);
        $user->put();

diff --git a/cmd/set/register.pl b/cmd/set/register.pl
index 22c85be9e0bddfcfee463d9bbdfcc900c7b1cde5..ac96c2a4f6c40c8329c1542b81eb264ce627a88d 100644 (file)
--- a/cmd/set/register.pl
+++ b/cmd/set/register.pl
@@ -22,7 +22,7 @@ return (1, $self->msg('reginac')) unless $main::reqreg;
 foreach $call (@args) {
        $call = uc $call;
        unless ($self->remotecmd || $self->inscript) {
-               if ($ref = DXUser->get_current($call)) {
+               if ($ref = DXUser::get_current($call)) {
                        $ref->registered(1);
                        $ref->put();
                        push @out, $self->msg("reg", $call);

diff --git a/cmd/set/routepc19.pl b/cmd/set/routepc19.pl
index 4c5d2efc5241e787388942fd7712b2f1abc3b657..a63af3cf46cc8295e46d2f422d0b5ba0672b994b 100644 (file)
--- a/cmd/set/routepc19.pl
+++ b/cmd/set/routepc19.pl
@@ -16,7 +16,7 @@ return (1, $self->msg('e5')) if $self->priv < 9;
 foreach $call (@args) {
        return (1, $self->msg('e12')) unless is_callsign($call);
 
-       my $user = DXUser->get_current($call);
+       my $user = DXUser::get_current($call);
        if ($user) {
                $user->wantroutepc19(1);
                $user->put;

diff --git a/cmd/set/sendpc16.pl b/cmd/set/sendpc16.pl
index 11ca2e8780c9169aa797e7b6a9365f65bcf8c026..a33c81605160d60d337a30c5cd01ff6b3c0a2c4c 100644 (file)
--- a/cmd/set/sendpc16.pl
+++ b/cmd/set/sendpc16.pl
@@ -16,7 +16,7 @@ return (1, $self->msg('e5')) if $self->priv < 9;
 foreach $call (@args) {
        return (1, $self->msg('e12')) unless is_callsign($call);
 
-       my $user = DXUser->get_current($call);
+       my $user = DXUser::get_current($call);
        if ($user) {
                $user->wantsendpc16(1);
                $user->put;

diff --git a/cmd/set/spider.pl b/cmd/set/spider.pl
index bd50853cdc91b7240e0d33df8f4f57a44fe1eea9..23cdd3780be256338f5f28da3c801050eb8fc922 100644 (file)
--- a/cmd/set/spider.pl
+++ b/cmd/set/spider.pl
@@ -23,7 +23,7 @@ foreach $call (@args) {
        if ($chan) {
                push @out, $self->msg('nodee1', $call);
        } else {
-               $user = DXUser->get($call);
+               $user = DXUser::get($call);
                $create = !$user;
                $user = DXUser->new($call) if $create;
                if ($user) {

diff --git a/cmd/set/sys_location.pl b/cmd/set/sys_location.pl
index 428d5bfcb83fbe0e6f47ffeb2ea6edb647479d6e..33633b67ecac742a474b3c2020c3379419f294c0 100644 (file)
--- a/cmd/set/sys_location.pl
+++ b/cmd/set/sys_location.pl
@@ -20,7 +20,7 @@ return (1, $self->msg('loce1')) if !$line;
 return (1, $self->msg('loce3', uc $line)) if is_qra($line);
 return (1, $self->msg('loce2', $line)) unless is_latlong($line);
 
-$user = DXUser->get_current($call);
+$user = DXUser::get_current($call);
 if ($user) {
        $line = uc $line;
        my ($lat, $long) = DXBearing::stoll($line);

diff --git a/cmd/set/user.pl b/cmd/set/user.pl
index 832dcac68037b66debf737e01ea66ed6860fc455..209f0e98059cf1902ea1f364ec1ec6325bca2c8c 100644 (file)
--- a/cmd/set/user.pl
+++ b/cmd/set/user.pl
@@ -23,7 +23,7 @@ foreach $call (@args) {
        if ($chan) {
                push @out, $self->msg('nodee1', $call);
        } else {
-               $user = DXUser->get($call);
+               $user = DXUser::get($call);
                return (1, $self->msg('usernf', $call)) if !$user;
                $user->sort('U');
                $user->priv(0);

diff --git a/cmd/set/uservar.pl b/cmd/set/uservar.pl
index c5e39fb7ca7b04f7c5c994cc132309553e70bb7c..9d955a7c2d4f7c03715245e0cc1a734ed157248f 100644 (file)
--- a/cmd/set/uservar.pl
+++ b/cmd/set/uservar.pl
@@ -14,7 +14,7 @@ return (1, $self->msg('suser1')) if @args < 3;
 
 
 my $call = uc $args[0];
-my $ref = DXUser->get_current($call);
+my $ref = DXUser::get_current($call);
 my $field = $args[1];
 my $value = $args[2];
 

diff --git a/cmd/set/usstate.pl b/cmd/set/usstate.pl
index f6c56721d4177b9c15e38ddbe9cec813b07e6e40..3babc8808c4f288d232fd18ff6f67b6813e7547f 100644 (file)
--- a/cmd/set/usstate.pl
+++ b/cmd/set/usstate.pl
@@ -17,7 +17,7 @@ return (1, $self->msg('db3', 'FCC USDB')) unless $USDB::present;
 
 foreach $call (@args) {
        $call = uc $call;
-       my $user = DXUser->get_current($call);
+       my $user = DXUser::get_current($call);
        if ($user) {
                $user->wantusstate(1);
                if ($user->wantdxitu) {

diff --git a/cmd/set/wantpc16.pl b/cmd/set/wantpc16.pl
index 0567de40d1e439ea69e1033d8405b5547cf9a782..9006b1c6df776677d8820a424b981efa9310c5e8 100644 (file)
--- a/cmd/set/wantpc16.pl
+++ b/cmd/set/wantpc16.pl
@@ -16,7 +16,7 @@ return (1, $self->msg('e5')) if $self->priv < 9;
 foreach $call (@args) {
        return (1, $self->msg('e12')) unless is_callsign($call);
 
-       my $user = DXUser->get_current($call);
+       my $user = DXUser::get_current($call);
        if ($user) {
                $user->wantpc16(1);
                $user->put;

diff --git a/cmd/set/wantpc9x.pl b/cmd/set/wantpc9x.pl
index 60566f0414bcdebe047a515b951da38c861667e1..2a5f42f9626bb9daa17735accb35a5eb7aef9cde 100644 (file)
--- a/cmd/set/wantpc9x.pl
+++ b/cmd/set/wantpc9x.pl
@@ -16,7 +16,7 @@ return (1, $self->msg('e5')) if $self->priv < 9;
 foreach $call (@args) {
        return (1, $self->msg('e12')) unless is_callsign($call);
 
-       my $user = DXUser->get_current($call);
+       my $user = DXUser::get_current($call);
        if ($user) {
                $user->wantpc9x(1);
                $user->put;

diff --git a/cmd/show/grayline.pl b/cmd/show/grayline.pl
index c2c6fcff2af0da3c6645806c606a53c1acc265d1..c1a509224c4d8bd8ed2f49594e371b98454c5774 100644 (file)
--- a/cmd/show/grayline.pl
+++ b/cmd/show/grayline.pl
@@ -33,7 +33,7 @@ my @in;
 
 if (@list) {
        foreach $l (@list) {
-               my $user = DXUser->get_current(uc $l);
+               my $user = DXUser::get_current(uc $l);
                if ($user && $user->lat && $user->long) {
                        push @in, [$user->qth, $user->lat, -$user->long, uc $l ];
                } else {

diff --git a/cmd/show/isolate.pl b/cmd/show/isolate.pl
index 17470bde4b69645abb7ced95e6e73e6d82fb5eba..daa77f42eb01be26fe65c8d454aaa01025d77167 100644 (file)
--- a/cmd/show/isolate.pl
+++ b/cmd/show/isolate.pl
@@ -18,7 +18,7 @@ use DB_File;
 my ($action, $count, $key, $data) = (0,0,0,0);
 for ($action = DXUser::R_FIRST, $count=0; !$DXUser::dbm->seq($key, $data, $action); $action = DXUser::R_NEXT) {
        if ($data =~ m{isolate}) {
-               my $u = DXUser->get_current($key);
+               my $u = DXUser::get_current($key);
                if ($u && $u->isolate) {
                        push @out, $key;
                        ++$count;

diff --git a/cmd/show/lockout.pl b/cmd/show/lockout.pl
index ff56ca19cd382bfb12c89708f772f66185ce8254..91ae4f4ae7ab87fc84943a03673db98386a342b2 100644 (file)
--- a/cmd/show/lockout.pl
+++ b/cmd/show/lockout.pl
@@ -26,7 +26,7 @@ my ($action, $count, $key, $data) = (0,0,0,0);
 eval qq{for (\$action = DXUser::R_FIRST, \$count = 0; !\$DXUser::dbm->seq(\$key, \$data, \$action); \$action = DXUser::R_NEXT) {
        if (\$data =~ m{lockout}) {
                if (\$line eq 'ALL' || \$key =~ /^$line/) {
-                       my \$ur = DXUser->get_current(\$key);
+                       my \$ur = DXUser::get_current(\$key);
                        if (\$ur && \$ur->lockout) {
                                push \@out, \$key;
                                ++\$count;

diff --git a/cmd/show/moon.pl b/cmd/show/moon.pl
index 6203797f787ad0df1ee7ae7745f9177ac7fc5805..1bc61479ca8cae031540d6f7274272631872a60e 100644 (file)
--- a/cmd/show/moon.pl
+++ b/cmd/show/moon.pl
@@ -40,7 +40,7 @@ my @in;
 
 if (@list) {
        foreach $l (@list) {
-               my $user = DXUser->get_current(uc $l);
+               my $user = DXUser::get_current(uc $l);
                if ($user && $user->lat && $user->long) {
                        push @in, [$user->qth, $user->lat, -$user->long, uc $l ];
                } else {

diff --git a/cmd/show/node.pl b/cmd/show/node.pl
index 1c6ee49ed5e997d536630a1d57365ad639d8f7f9..b41cd93f0bcd0575128556c775c64cd261b048d0 100644 (file)
--- a/cmd/show/node.pl
+++ b/cmd/show/node.pl
@@ -39,7 +39,7 @@ if (@call == 0) {
 my $call;
 foreach $call (sort @call) {
        my $clref = Route::Node::get($call);
-       my $uref = DXUser->get_current($call);
+       my $uref = DXUser::get_current($call);
        my ($sort, $ver, $build);
        
        my $pcall = sprintf "%-11s", $call;

diff --git a/cmd/show/registered.pl b/cmd/show/registered.pl
index 593ef0f50ba1d313864019ec4af53f8f90df9dd5..5eb6d78d7264ce670582e9a728e9660ab493b9a2 100644 (file)
--- a/cmd/show/registered.pl
+++ b/cmd/show/registered.pl
@@ -24,7 +24,7 @@ my ($action, $count, $key, $data) = (0,0,0,0);
 eval qq{for (\$action = DXUser::R_FIRST, \$count = 0; !\$DXUser::dbm->seq(\$key, \$data, \$action); \$action = DXUser::R_NEXT) {
        if (\$data =~ m{registered}) {                                  
                if (!\$line || (\$line && \$key =~ /^$line/)) {
-                       my \$u = DXUser->get_current(\$key);
+                       my \$u = DXUser::get_current(\$key);
                        if (\$u && \$u->registered) {
                                push \@out, \$key;
                                ++\$count;

diff --git a/cmd/show/station.pl b/cmd/show/station.pl
index a5ffe2adc01f9e8f651da739982a10134dab5b46..55976a6917f709187e7dfd0e15ea37e7b8bcb7fd 100644 (file)
--- a/cmd/show/station.pl
+++ b/cmd/show/station.pl
@@ -26,7 +26,7 @@ if (@f <= 2 && uc $f[0] eq 'ALL') {
        }
        
        foreach $call (@calls) {
-               my $ref = DXUser->get_current($call);
+               my $ref = DXUser::get_current($call);
                next if !$ref;
                my $lat = $ref->lat;
                my $long = $ref->long;
@@ -42,7 +42,7 @@ if (@f <= 2 && uc $f[0] eq 'ALL') {
        }
 } else {
        foreach $call (@f) {
-               my $ref = DXUser->get_current($call);
+               my $ref = DXUser::get_current($call);
                if ($ref) {
                        my $name = $ref->name;  
                        my $qth = $ref->qth;

diff --git a/cmd/show/sun.pl b/cmd/show/sun.pl
index 36aaa07897d2b3db4792f61dcb51db697733c9f4..cf27423e48e1b5739689829728fdb7403808f2c1 100644 (file)
--- a/cmd/show/sun.pl
+++ b/cmd/show/sun.pl
@@ -39,7 +39,7 @@ my @in;
 
 if (@list) {
        foreach $l (@list) {
-               my $user = DXUser->get_current(uc $l);
+               my $user = DXUser::get_current(uc $l);
                if ($user && $user->lat && $user->long) {
                        push @in, [$user->qth, $user->lat, -$user->long, uc $l ];
                } else {

diff --git a/cmd/show/users.pl b/cmd/show/users.pl
index 125b23d1884cde22fdda09ef624d46779e23ca99..1d665eba5a91858dbdfa89f33bb42879e776753b 100644 (file)
--- a/cmd/show/users.pl
+++ b/cmd/show/users.pl
@@ -12,7 +12,7 @@ my @out;
 
 if (@list) {
        foreach my $call (sort @list) {
-               my $uref = DXUser->get_current($call);
+               my $uref = DXUser::get_current($call);
                if ($uref) {
                        my $name = $uref->name || '?';
                        my $qth = $uref->qth || '?';

diff --git a/cmd/spoof.pl b/cmd/spoof.pl
index ad2f9b8ccbb408a9b64b15accd907f87b36370a3..e0194a1178e1bfd5b09eba285da1e9a34a304eb5 100644 (file)
--- a/cmd/spoof.pl
+++ b/cmd/spoof.pl
@@ -26,7 +26,7 @@ if ($self->priv < 9) {
 
 my @out;
 $call = uc $call;
-my $user = DXUser->get_current($call);
+my $user = DXUser::get_current($call);
 unless ($user) {
        $user = DXUser->new($call);
        push @out, $self->msg('spf1', $call);

diff --git a/cmd/stat/user.pl b/cmd/stat/user.pl
index 1e0f15daa535d15ad3f99ad0297809dcca0b9de7..5cb57f29dd3b4e4ce6c06cd81372a3f1c4e705c8 100644 (file)
--- a/cmd/stat/user.pl
+++ b/cmd/stat/user.pl
@@ -12,7 +12,7 @@ my $call;
 my @out;
 foreach $call (@list) {
        $call = uc $call;
-       my $ref = DXUser->get_current($call);
+       my $ref = DXUser::get_current($call);
        if ($ref) {
                if ($self->consort eq 'ax25') {
                        @out = grep { !/(Password|Privilege)/ } print_all_fields($self, $ref, "User Information $call");

diff --git a/cmd/sysop.pl b/cmd/sysop.pl
index ba42ba6057cd65b97347660355ff372b95110625..6dcef2c24dc17497e5cdb1e22867f948ad30e4d0 100644 (file)
--- a/cmd/sysop.pl
+++ b/cmd/sysop.pl
@@ -6,7 +6,7 @@
 #
 
 my ($self, $line) = @_;
-my $user = DXUser->get_current($self->call);
+my $user = DXUser::get_current($self->call);
 my $passwd = $user->passwd if $user;
 my $lth = length $passwd;
 $lth = 100 unless $lth;

diff --git a/cmd/uncatchup.pl b/cmd/uncatchup.pl
index 8a6d736a3696720b5843dc5ce8fec8cbae1c621a..8a6f02a680eda9bfa1aa3d488528e1e3c001ccd8 100644 (file)
--- a/cmd/uncatchup.pl
+++ b/cmd/uncatchup.pl
@@ -16,7 +16,7 @@ my @f = split /\s+/, $line;
 return (1, "usage: catchup <node call> all|[<msgno ...]") unless @f >= 2;
 
 my $call = uc shift @f;
-my $user = DXUser->get_current($call);
+my $user = DXUser::get_current($call);
 return (1, "$call not a node") unless $user && $user->sort ne 'U';
 
 my @out;

diff --git a/cmd/unset/believe.pl b/cmd/unset/believe.pl
index 2d0a6e3a175abd45fcfddd01bade3d121b732413..a7dcfb83e89c11b54bc8f085e0c03e5e9d5e2881 100644 (file)
--- a/cmd/unset/believe.pl
+++ b/cmd/unset/believe.pl
@@ -15,13 +15,13 @@ my @nodes;
 
 return (1, $self->msg('e5')) if $self->priv < 6;
 return (1, $self->msg('e22', $node)) unless is_callsign($node);
-my $user = DXUser->get_current($node);
+my $user = DXUser::get_current($node);
 return (1, $self->msg('e13', $node)) unless $user->is_node;
 
 foreach $call (@args) {
        return (1, $self->msg('e22', $node)) unless is_callsign($call);
 
-       my $u = DXUser->get_current($call);
+       my $u = DXUser::get_current($call);
        push @nodes, $call;
 }
 

diff --git a/cmd/unset/dxcq.pl b/cmd/unset/dxcq.pl
index fc2d7c5e04b1d6a0c29b27c87427a27008196db0..6cc68f058c9e03a4313761beb811fd61dbf192fd 100644 (file)
--- a/cmd/unset/dxcq.pl
+++ b/cmd/unset/dxcq.pl
@@ -15,7 +15,7 @@ my @out;
 
 foreach $call (@args) {
        $call = uc $call;
-       my $user = DXUser->get_current($call);
+       my $user = DXUser::get_current($call);
        if ($user) {
                $user->wantdxcq(0);
                $user->put;

diff --git a/cmd/unset/dxgrid.pl b/cmd/unset/dxgrid.pl
index f18f2c2270690a44d534d52bf9cd5524b1a17f26..bee3d9069c8cd9ba17a012d5bacdb53fd96095f3 100644 (file)
--- a/cmd/unset/dxgrid.pl
+++ b/cmd/unset/dxgrid.pl
@@ -15,7 +15,7 @@ my @out;
 
 foreach $call (@args) {
        $call = uc $call;
-       my $user = DXUser->get_current($call);
+       my $user = DXUser::get_current($call);
        if ($user) {
                $user->wantgrid(0);
                $user->put;

diff --git a/cmd/unset/dxitu.pl b/cmd/unset/dxitu.pl
index 27b7fc41d07d21b300dc3326ecbb319941009c8e..1b4c2456ff70ae89e4da815073dd6935110c8cad 100644 (file)
--- a/cmd/unset/dxitu.pl
+++ b/cmd/unset/dxitu.pl
@@ -15,7 +15,7 @@ my @out;
 
 foreach $call (@args) {
        $call = uc $call;
-       my $user = DXUser->get_current($call);
+       my $user = DXUser::get_current($call);
        if ($user) {
                $user->wantdxitu(0);
                $user->put;

diff --git a/cmd/unset/email.pl b/cmd/unset/email.pl
index 0f61405e108475af0bae2f3177d587898b10578c..c05a9e538b41ed94238e978ddeab667cbb65db86 100644 (file)
--- a/cmd/unset/email.pl
+++ b/cmd/unset/email.pl
@@ -10,7 +10,7 @@ my ($self, $line) = @_;
 my $call = $self->call;
 my $user;
 
-$user = DXUser->get_current($call);
+$user = DXUser::get_current($call);
 if ($user) {
        $user->wantemail(0);
        $user->put();

diff --git a/cmd/unset/isolate.pl b/cmd/unset/isolate.pl
index 07ad21dcc390dedf514487571db9b016932ca7bf..df14e8a9e211f859498cefc7ee9aca8dcee110a3 100644 (file)
--- a/cmd/unset/isolate.pl
+++ b/cmd/unset/isolate.pl
@@ -23,7 +23,7 @@ foreach $call (@args) {
        if ($chan) {
                push @out, $self->msg('nodee1', $call);
        } else {
-               $user = DXUser->get($call);
+               $user = DXUser::get($call);
                return (1, $self->msg('usernf', $call)) if !$user; 
                $user->isolate(0);
                $user->close();

diff --git a/cmd/unset/local_node.pl b/cmd/unset/local_node.pl
index c9439ae32a578f737dd90e77405d803a6f773af9..9753fb593f521e290f33dddf16aa74f9983462f7 100644 (file)
--- a/cmd/unset/local_node.pl
+++ b/cmd/unset/local_node.pl
@@ -13,7 +13,7 @@ my @out;
 return (1, $self->msg('e5')) unless $self->priv >= 5;
 
 foreach my $call (@args) {
-       my $user = DXUser->get_current($call);
+       my $user = DXUser::get_current($call);
        push(@out, $self->msg('e3', 'set/localnode', $call)), next unless $user; 
        push(@out, $self->msg('e13', $call)), next unless $user->is_node; 
        my $group = $user->group || [];

diff --git a/cmd/unset/lockout.pl b/cmd/unset/lockout.pl
index 406d2125f408e18a46e221e5228c93d9c6747824..02169f30744ea2ac4fe790218cf64faba24fb634 100644 (file)
--- a/cmd/unset/lockout.pl
+++ b/cmd/unset/lockout.pl
@@ -21,7 +21,7 @@ if ($self->priv < 9) {
 foreach $call (@args) {
        $call = uc $call;
        unless ($self->remotecmd || $self->inscript) {
-               if ($ref = DXUser->get_current($call)) {
+               if ($ref = DXUser::get_current($call)) {
                        $ref->lockout(0);
                        $ref->put();
                        push @out, $self->msg("lockoutun", $call);

diff --git a/cmd/unset/passphrase.pl b/cmd/unset/passphrase.pl
index 9bf6a61cdf8ad49618b7a8eba25d437d28cbc371..15ef58d114f7f4d7f3c6d7439ec7d5c3abcbbc0b 100644 (file)
--- a/cmd/unset/passphrase.pl
+++ b/cmd/unset/passphrase.pl
@@ -24,7 +24,7 @@ if ($self->priv < 9) {
 
 for (@args) {
        my $call = uc $_;
-       if ($ref = DXUser->get_current($call)) {
+       if ($ref = DXUser::get_current($call)) {
                $ref->unset_passphrase;
                $ref->put();
                push @out, $self->msg("passphraseu", $call);

diff --git a/cmd/unset/password.pl b/cmd/unset/password.pl
index fcaa4c747bb0c626e0f584a0411fc0b0e4689a8e..0a844ca7340a6cd80002753912449d710f562352 100644 (file)
--- a/cmd/unset/password.pl
+++ b/cmd/unset/password.pl
@@ -24,7 +24,7 @@ if ($self->priv < 9) {
 
 for (@args) {
        my $call = uc $_;
-       if ($ref = DXUser->get_current($call)) {
+       if ($ref = DXUser::get_current($call)) {
                $ref->unset_passwd;
                $ref->put();
                push @out, $self->msg("passwordu", $call);

diff --git a/cmd/unset/prompt.pl b/cmd/unset/prompt.pl
index 4aff6d4abe240305e2b1402cef1872fce7211f5b..063c9d485fb2eec57c0a1e81d8cd30272aabbc48 100644 (file)
--- a/cmd/unset/prompt.pl
+++ b/cmd/unset/prompt.pl
@@ -10,7 +10,7 @@ my ($self, $line) = @_;
 my $call = $self->call;
 my $user;
 
-$user = DXUser->get_current($call);
+$user = DXUser::get_current($call);
 if ($user) {
        delete $user->{prompt};
        delete $self->{prompt};

diff --git a/cmd/unset/register.pl b/cmd/unset/register.pl
index 5ba142d69a5423c75c021161d6672076ec96dcff..a0c36d78f7ce299514fa5929f73aaca4920f7ed0 100644 (file)
--- a/cmd/unset/register.pl
+++ b/cmd/unset/register.pl
@@ -22,7 +22,7 @@ return (1, $self->msg('reginac')) unless $main::reqreg;
 foreach $call (@args) {
        $call = uc $call;
        unless ($self->remotecmd || $self->inscript) {
-               if ($ref = DXUser->get_current($call)) {
+               if ($ref = DXUser::get_current($call)) {
                        $ref->registered(0);
                        $ref->put();
                        my $dxchan = DXChannel::get($call);

diff --git a/cmd/unset/routepc19.pl b/cmd/unset/routepc19.pl
index ffb46f892223a63b25138f021a11019a18ad490c..d04bedcaae3f2a03f387aa04da4f37f0ac677a90 100644 (file)
--- a/cmd/unset/routepc19.pl
+++ b/cmd/unset/routepc19.pl
@@ -16,7 +16,7 @@ return (1, $self->msg('e5')) if $self->priv < 9;
 foreach $call (@args) {
        return (1, $self->msg('e12')) unless is_callsign($call);
 
-       my $user = DXUser->get_current($call);
+       my $user = DXUser::get_current($call);
        if ($user) {
                $user->wantroutepc19(0);
                $user->put;

diff --git a/cmd/unset/sendpc16.pl b/cmd/unset/sendpc16.pl
index 59919491c7a1e90a39244e39abebe6613352aaed..0ef16cb3c89d76d6052f5b8ae6e0e59011af83db 100644 (file)
--- a/cmd/unset/sendpc16.pl
+++ b/cmd/unset/sendpc16.pl
@@ -16,7 +16,7 @@ return (1, $self->msg('e5')) if $self->priv < 9;
 foreach $call (@args) {
        return (1, $self->msg('e12')) unless is_callsign($call);
 
-       my $user = DXUser->get_current($call);
+       my $user = DXUser::get_current($call);
        if ($user) {
                $user->wantsendpc16(0);
                $user->put;

diff --git a/cmd/unset/usstate.pl b/cmd/unset/usstate.pl
index df61bae532ba461b465f5e67dd28c40e097aafbe..2a2d95dd47cedbb4f285f887011b805479e4dbe4 100644 (file)
--- a/cmd/unset/usstate.pl
+++ b/cmd/unset/usstate.pl
@@ -17,7 +17,7 @@ return (1, $self->msg('db3', 'FCC USDB')) unless $USDB::present;
 
 foreach $call (@args) {
        $call = uc $call;
-       my $user = DXUser->get_current($call);
+       my $user = DXUser::get_current($call);
        if ($user) {
                $user->wantusstate(0);
                $user->put;

diff --git a/cmd/unset/wantpc16.pl b/cmd/unset/wantpc16.pl
index f87b6db59121a46777d3f92c5f2c91094a59828a..a749084a91eaa959553ccb7d061a883974375d9b 100644 (file)
--- a/cmd/unset/wantpc16.pl
+++ b/cmd/unset/wantpc16.pl
@@ -16,7 +16,7 @@ return (1, $self->msg('e5')) if $self->priv < 9;
 foreach $call (@args) {
        return (1, $self->msg('e12')) unless is_callsign($call);
 
-       my $user = DXUser->get_current($call);
+       my $user = DXUser::get_current($call);
        if ($user) {
                $user->wantpc16(0);
                $user->put;

diff --git a/cmd/unset/wantpc9x.pl b/cmd/unset/wantpc9x.pl
index 2bc876bad92cde989336bf264bf2ff8bbb5b673c..e72795832e9d565d437cb18f74355cc4082b8304 100644 (file)
--- a/cmd/unset/wantpc9x.pl
+++ b/cmd/unset/wantpc9x.pl
@@ -16,7 +16,7 @@ return (1, $self->msg('e5')) if $self->priv < 9;
 foreach $call (@args) {
        return (1, $self->msg('e12')) unless is_callsign($call);
 
-       my $user = DXUser->get_current($call);
+       my $user = DXUser::get_current($call);
        if ($user) {
                $user->wantpc9x(0);
                $user->put;

diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index cdde9a20b99e512247f6d4fd837ff44050bf8b05..854a635496e058a651896d04bc8f412a381f84ea 100644 (file)
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -971,7 +971,7 @@ sub format_dx_spot
        my $comment = substr (($_[3] || ''), 0, $clth);
        $comment .= ' ' x ($clth - length($comment));
        if ($self->{user}->wantgrid) {
-               my $ref = DXUser->get_current($_[4]);
+               my $ref = DXUser::get_current($_[4]);
                if ($ref) {
                        $loc = $ref->qra || '';
                        $loc = ' ' . substr($loc, 0, 4) if $loc;
@@ -1015,7 +1015,7 @@ sub dx_spot
        } elsif ($self->{gtk}) {
                my ($dxloc, $byloc);
 
-               my $ref = DXUser->get_current($_[4]);
+               my $ref = DXUser::get_current($_[4]);
                if ($ref) {
                        $byloc = $ref->qra;
                        $byloc = substr($byloc, 0, 4) if $byloc;
@@ -1023,7 +1023,7 @@ sub dx_spot
 
                my $spot = $_[1];
                $spot =~ s|/\w{1,4}$||;
-               $ref = DXUser->get_current($spot);
+               $ref = DXUser::get_current($spot);
                if ($ref) {
                        $dxloc = $ref->qra;
                        $dxloc = substr($dxloc, 0, 4) if $dxloc;
@@ -1191,7 +1191,7 @@ sub import_cmd
                            if ($dxchan) {
                                        @out = $s->run($dxchan, 1);
                                } else {
-                                       my $u = DXUser->get($call);
+                                       my $u = DXUser::get($call);
                                        if ($u) {
                                                $dxchan = $main::me;
                                                my $old = $dxchan->{call};

diff --git a/perl/DXCron.pm b/perl/DXCron.pm
index 2c02be53e4432c22def3c6ad28bfa83076a93a9f..70c8e6606515015731646ccc4a3e6490cb51c0ef 100644 (file)
--- a/perl/DXCron.pm
+++ b/perl/DXCron.pm
@@ -219,7 +219,7 @@ sub last_connect
 {
        my $call = uc shift;
        return $main::systime if DXChannel::get($call);
-       my $user = DXUser->get($call);
+       my $user = DXUser::get($call);
        return $user ? $user->lastin : 0;
 }
 

diff --git a/perl/DXMsg.pm b/perl/DXMsg.pm
index 9c75a048465badb106299e9ea326bc3665ea4bf1..e6662b59472fce0d46e8496235f3c52f271133e4 100644 (file)
--- a/perl/DXMsg.pm
+++ b/perl/DXMsg.pm
@@ -124,7 +124,7 @@ sub alloc
        $self->{gotit} = [];
 #      $self->{lastt} = $main::systime;
        $self->{lines} = [];
-       $self->{private} = 1 if $bulltopriv && DXUser->get_current($self->{to});
+       $self->{private} = 1 if $bulltopriv && DXUser::get_current($self->{to});
     
        return $self;
 }
@@ -200,7 +200,7 @@ sub handle_28
        $ref->{lastt} = $main::systime;
 
        # look to see whether this is a non private message sent to a known callsign
-       my $uref = DXUser->get_current($ref->{to});
+       my $uref = DXUser::get_current($ref->{to});
        if (is_callsign($ref->{to}) && !$ref->{private} && $uref && $uref->homenode) {
                $ref->{private} = 1;
                dbg("set bull to $ref->{to} to private") if isdbg('msg');
@@ -476,7 +476,7 @@ sub notify
 {
        my $ref = shift;
        my $to = $ref->{to};
-       my $uref = DXUser->get_current($to);
+       my $uref = DXUser::get_current($to);
        my $dxchan = DXChannel::get($to);
        if (((*Net::SMTP && $email_server) || $email_prog) && $uref && $uref->wantemail) {
                my $email = $uref->email;

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 4d79ecf58110370494b0203523773dcb248b3013..69eb2228a194f4323638bf0b32cd6b7b005df6b1 100644 (file)
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -232,7 +232,7 @@ sub init
        do "$main::data/hop_table.pl" if -e "$main::data/hop_table.pl";
        confess $@ if $@;
 
-       my $user = DXUser->get($main::mycall);
+       my $user = DXUser::get($main::mycall);
        die "User $main::mycall not setup or disappeared RTFM" unless $user;
 
        $myprot_version += $main::version*100;
@@ -1122,7 +1122,7 @@ sub process_rcmd
 {
        my ($self, $tonode, $fromnode, $user, $cmd) = @_;
        if ($tonode eq $main::mycall) {
-               my $ref = DXUser->get_current($fromnode);
+               my $ref = DXUser::get_current($fromnode);
                my $cref = Route::Node::get($fromnode);
                Log('rcmd', 'in', ($ref->{priv}||0), $fromnode, $cmd);
                if ($cmd !~ /^\s*rcmd/i && $cref && $ref && $ref->homenode && $cref->call eq $ref->homenode) { # not allowed to relay RCMDS!
@@ -1141,7 +1141,7 @@ sub process_rcmd
                        $self->send_rcmd_reply($main::mycall, $fromnode, $user, "your attempt is logged, Tut tut tut...!");
                }
        } else {
-               my $ref = DXUser->get_current($tonode);
+               my $ref = DXUser::get_current($tonode);
                if ($ref && $ref->is_clx) {
                        $self->route($tonode, pc84($fromnode, $tonode, $user, $cmd));
                } else {
@@ -1166,7 +1166,7 @@ sub process_rcmd_reply
                        $dxchan->send($line) if $dxchan;
                }
        } else {
-               my $ref = DXUser->get_current($tonode);
+               my $ref = DXUser::get_current($tonode);
                if ($ref && $ref->is_clx) {
                        $self->route($tonode, pc85($fromnode, $tonode, $user, $line));
                } else {

diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm
index f28de6d065cbae54941df6703de4e9ed55a26248..e7160d7cb7148b0e59e5a809cd63258163f0e7b4 100644 (file)
--- a/perl/DXProtHandle.pm
+++ b/perl/DXProtHandle.pm
@@ -226,7 +226,7 @@ sub handle_11
        #
 
        # fix up qra locators of known users
-       my $user = DXUser->get_current($spot[4]);
+       my $user = DXUser::get_current($spot[4]);
        if ($user) {
                my $qra = $user->qra;
                unless ($qra && is_qra($qra)) {
@@ -463,7 +463,7 @@ sub handle_16
 
                # reject this if we think it is a node already
                my $r = Route::Node::get($call);
-               my $u = DXUser->get_current($call) unless $r;
+               my $u = DXUser::get_current($call) unless $r;
                if ($r || ($u && $u->is_node)) {
                        dbg("PCPROT: $call is a node") if isdbg('chanerr');
                        next;
@@ -485,7 +485,7 @@ sub handle_16
                }
 
                # add this station to the user database, if required
-               my $user = DXUser->get_current($ncall);
+               my $user = DXUser::get_current($ncall);
                $user = DXUser->new($call) unless $user;
                $user->homenode($parent->call) if !$user->homenode;
                $user->node($parent->call);
@@ -568,7 +568,7 @@ sub handle_17
        $parent->del_user($uref);
 
        # send info to all logged in thingies
-       my $user = DXUser->get_current($ncall);
+       my $user = DXUser::get_current($ncall);
        $self->tell_login('logoutu', "$ncall: $ucall") if $user && $user->is_local_node;
        $self->tell_buddies('logoutb', $ucall, $ncall);
 
@@ -638,7 +638,7 @@ sub check_add_node
        my $call = shift;
 
        # add this station to the user database, if required (don't remove SSID from nodes)
-       my $user = DXUser->get_current($call);
+       my $user = DXUser::get_current($call);
        if (!$user) {
                $user = DXUser->new($call);
                $user->priv(1);         # I have relented and defaulted nodes
@@ -1142,7 +1142,7 @@ sub handle_41
        }
 
        # add this station to the user database, if required
-       my $user = DXUser->get_current($call);
+       my $user = DXUser::get_current($call);
        $user = DXUser->new($call) unless $user;
 
        if ($sort == 1) {

diff --git a/perl/DXUser.pm b/perl/DXUser.pm
index c4e3996b35b5e90a0ebde9688de582e6a86b3839..e2c24f598a5eee6d7fdd941ade20ac7f46cb0c78 100644 (file)
--- a/perl/DXUser.pm
+++ b/perl/DXUser.pm
@@ -237,7 +237,6 @@ sub new
 
 sub get
 {
-       my $pkg = shift;
        my $call = uc shift;
        my $data;
        
@@ -248,6 +247,11 @@ sub get
        # search for it
        unless ($dbm->get($call, $data)) {
                $ref = decode($data);
+               dbg("DXUser::get: data error on $call $!") unless $ref;
+               if ($ref && ref $ref ne 'DXUser') {
+                       dbg("DXUser::get: got strange answer from decode ". ref $ref. " ignoring");
+                       return undef;
+               }
                $lru->put($call, $ref);
                return $ref;
        }
@@ -264,14 +268,11 @@ sub get
 
 sub get_current
 {
-       my $pkg = shift;
        my $call = uc shift;
   
        my $dxchan = DXChannel::get($call);
        return $dxchan->user if $dxchan;
-       my $rref = Route::get($call);
-       return $rref->user if $rref && exists $rref->{user};
-       return $pkg->get($call);
+       return get($call);
 }
 
 #

diff --git a/perl/DXXml/Cmd.pm b/perl/DXXml/Cmd.pm
index f9521e46c61af1882f3a71a7aff9b2121f006888..5f89456838f439253d2554427edd40df3d88af68 100644 (file)
--- a/perl/DXXml/Cmd.pm
+++ b/perl/DXXml/Cmd.pm
@@ -33,7 +33,7 @@ sub handle_input
                        @in = (DXCommandmode::run_cmd($dxchan, $cmd));
                } else {
                        # remote command
-                       my $ref = DXUser->get_current($self->{o});
+                       my $ref = DXUser::get_current($self->{o});
                        my $cref = Route::Node::get($self->{o});
                        my $answer;
                        
@@ -61,7 +61,7 @@ sub topcxx
 {
        my $self = shift;
 
-       my $ref = DXUser->get_current($self->{to});
+       my $ref = DXUser::get_current($self->{to});
        my $s;
        
        if ($ref && $ref->is_clx && $self->{u}) {

diff --git a/perl/DXXml/Ping.pm b/perl/DXXml/Ping.pm
index 29d7ab1c6a89ac7b1d99f92a7b627b6fcf82bed8..270587198928773eba4b9e1dd72f722aa593a324 100644 (file)
--- a/perl/DXXml/Ping.pm
+++ b/perl/DXXml/Ping.pm
@@ -68,7 +68,7 @@ sub add
 
        push @$ref, $self;
        $pings{$to} = $ref;
-       my $u = DXUser->get_current($to);
+       my $u = DXUser::get_current($to);
        if ($u) {
                $u->lastping(($via || $from), $main::systime);
                $u->put;
@@ -137,7 +137,7 @@ sub _handle_believe
 {
        my ($from, $via) = @_;
        
-       my $user = DXUser->get_current($from);
+       my $user = DXUser::get_current($from);
        if ($user) {
                $user->set_believe($via);
                $user->put;

diff --git a/perl/DXXml/Text.pm b/perl/DXXml/Text.pm
index 34bacc68c44a11915a8230cb523dc845304099b3..3b8b5b4438797e5919b0989d24cc1feb7b0c772d 100644 (file)
--- a/perl/DXXml/Text.pm
+++ b/perl/DXXml/Text.pm
@@ -40,7 +40,7 @@ sub topcxx
        my $dxchan = shift;
        my @out;
 
-       my $ref = DXUser->get_current($self->{to});
+       my $ref = DXUser::get_current($self->{to});
        for (split /(?:%0D)?\%0A/, $self->{content}) {
                my $line = $_;
                $line =~ s/\s*$//;

diff --git a/perl/ExtMsg.pm b/perl/ExtMsg.pm
index ae50f036568c57a02596f1d70b40c38260289876..0ca2de83c6f5d367a67fbb4dc87d0267372b84f0 100644 (file)
--- a/perl/ExtMsg.pm
+++ b/perl/ExtMsg.pm
@@ -106,7 +106,7 @@ sub dequeue
                                        my $sort = $conn->{csort};
                                        $sort = 'local' if $conn->{peerhost} =~ /127\.\d+\.\d+\.\d+$/ || $conn->{peerhost} eq '::1';
                                        my $uref;
-                                       if ($main::passwdreq || ($uref = DXUser->get_current($msg)) && $uref->passwd ) {
+                                       if ($main::passwdreq || ($uref = DXUser::get_current($msg)) && $uref->passwd ) {
                                                $conn->conns($msg);
                                                $conn->{state} = 'WP';
                                                $conn->{decho} = $conn->{echo};
@@ -120,7 +120,7 @@ sub dequeue
                                        $conn->disconnect;
                                }
                        } elsif ($conn->{state} eq 'WP' ) {
-                               my $uref = DXUser->get_current($conn->{call});
+                               my $uref = DXUser::get_current($conn->{call});
                                $msg =~ s/[\r\n]+$//;
                                if ($uref && $msg eq $uref->passwd) {
                                        my $sort = $conn->{csort};

diff --git a/perl/Filter.pm b/perl/Filter.pm
index e599c59b9efad13a1ee02d963f6983219d924eb4..b71ee95a5b81833acb4a1fc566592b832071529f 100644 (file)
--- a/perl/Filter.pm
+++ b/perl/Filter.pm
@@ -385,7 +385,7 @@ sub parse
        while (@f) {
                if ($ntoken == 0) {
                        
-                       if (@f && $dxchan->priv >= 8 && ((is_callsign(uc $f[0]) && DXUser->get(uc $f[0])) || $f[0] =~ /(?:node|user)_default/)) {
+                       if (@f && $dxchan->priv >= 8 && ((is_callsign(uc $f[0]) && DXUser::get(uc $f[0])) || $f[0] =~ /(?:node|user)_default/)) {
                                $call = shift @f;
                                if ($f[0] eq 'input') {
                                        shift @f;
@@ -550,7 +550,7 @@ sub cmd
        return $dxchan->msg('filter5') unless $line;
 
        my ($r, $filter, $fno, $user, $s) = $self->parse($dxchan, $sort, $line);
-       my $u = DXUser->get_current($user);
+       my $u = DXUser::get_current($user);
        return (1, $dxchan->msg('isow', $user)) if $u && $u->isolate;
        return (1, $filter) if $r;
 

diff --git a/perl/VE7CC.pm b/perl/VE7CC.pm
index c0138cd73bb31eac30d811594160a7d2737d1aff..81a11144b8f3ed4b1fbd0e538c77da67d9207eaa 100644 (file)
--- a/perl/VE7CC.pm
+++ b/perl/VE7CC.pm
@@ -27,7 +27,7 @@ sub dx_spot
        my $t = shift;
        my $loc_spotted = '';
        my $loc_spotter = '';
-       my $ref = DXUser->get_current($spotted);
+       my $ref = DXUser::get_current($spotted);
        if ($ref) {
                my $loc = $ref->qra || '';
                $loc_spotted =substr($loc, 0, 4) if $loc;
@@ -42,7 +42,7 @@ sub dx_spot
        
        my $spotted_cc = (Prefix::cty_data($spotted))[5];
        my $spotter_cc = (Prefix::cty_data($_[1]))[5];
-       $ref = DXUser->get_current($_[1]);
+       $ref = DXUser::get_current($_[1]);
        if ($ref) {
                my $loc = $ref->qra || '';
                $loc_spotter = substr($loc, 0, 4) if $loc;

diff --git a/perl/Version.pm b/perl/Version.pm
index 95d16219955fe31ec6c69114cb551eadcb9654f6..aded7d3d7da96eec85c0c3bf4a572ba568ebf625 100644 (file)
--- a/perl/Version.pm
+++ b/perl/Version.pm
@@ -11,6 +11,6 @@ use vars qw($version $subversion $build);
 
 $version = '1.54';
 $subversion = '0';
-$build = '219';
+$build = '220';
 
 1;

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 4b7abd585696bf2dabd4f9c8be63cc43a7072a98..6791896682c75922543246e1a79761300bdd76bb 100755 (executable)
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -165,7 +165,7 @@ sub new_channel
 
        # set up the basic channel info
        # is there one already connected to me - locally?
-       my $user = DXUser->get_current($call);
+       my $user = DXUser::get_current($call);
        my $dxchan = DXChannel::get($call);
        if ($dxchan) {
                if ($user && $user->is_node) {
@@ -186,7 +186,7 @@ sub new_channel
        # is he locked out ?
        my $basecall = $call;
        $basecall =~ s/-\d+$//;
-       my $baseuser = DXUser->get_current($basecall);
+       my $baseuser = DXUser::get_current($basecall);
        my $lock = $user->lockout if $user;
        if ($baseuser && $baseuser->lockout || $lock) {
                if (!$user || !defined $lock || $lock) {
@@ -387,9 +387,9 @@ DXUser->init($userfn, 1);
 
 # look for the sysop and the alias user and complain if they aren't there
 {
-       my $ref = DXUser->get($mycall);
+       my $ref = DXUser::get($mycall);
        die "$mycall missing, run the create_sysop.pl script and please RTFM" unless $ref && $ref->priv == 9;
-       $ref = DXUser->get($myalias);
+       $ref = DXUser::get($myalias);
        die "$myalias missing, run the create_sysop.pl script and please RTFM" unless $ref && $ref->priv == 9;
 }
 

diff --git a/perl/convert_users.pl b/perl/convert_users.pl
index 4aa3978b19d03dfed622a5cab7287c13bc717332..b55daea0f250a287bb145e4b53475ee9c80b33d7 100755 (executable)
--- a/perl/convert_users.pl
+++ b/perl/convert_users.pl
@@ -50,7 +50,7 @@ package DXUser;
 @all = DXUser::get_all_calls();
 
 for $a (@all) {
-       my $ref = DXUser->get($a);
+       my $ref = DXUser::get($a);
        my $s = $ref->encode() if $ref;
        print OUT "'$a' => q{$s},\n" if $a;
        $count++;

diff --git a/perl/create_sysop.pl b/perl/create_sysop.pl
index 622bc05656052a05edb19b2c30daf5839d7fb3dc..c0ac9e3afc7d8557803a71fc146e65a72fc09349 100755 (executable)
--- a/perl/create_sysop.pl
+++ b/perl/create_sysop.pl
@@ -28,7 +28,7 @@ sub delete_it
 
 sub create_it
 {
-       my $ref = DXUser->get(uc $mycall);
+       my $ref = DXUser::get(uc $mycall);
        $ref->del() if $ref;
        
        my $self = DXUser->new(uc $mycall);
@@ -51,7 +51,7 @@ sub create_it
        $self->close();
 
        # now do one for the alias
-       $ref = DXUser->get(uc $myalias);
+       $ref = DXUser::get(uc $myalias);
        $ref->del() if $ref;
 
        $self = DXUser->new(uc $myalias);

diff --git a/perl/lock_nodes.pl b/perl/lock_nodes.pl
index d57a6a0a4680032633590fd65ca52d993f21ac2c..4763fb1282666913a44ba01d54d1e5678dac90b6 100755 (executable)
--- a/perl/lock_nodes.pl
+++ b/perl/lock_nodes.pl
@@ -45,7 +45,7 @@ my @ignore;
 my ($action, $key, $data) = (0,0,0);
 for ($action = DXUser::R_FIRST, $count = 0; !$DXUser::dbm->seq($key, $data, $action); $action = DXUser::R_NEXT) {
        if ($data =~ m{sort => '[ACRSX]'}) {
-               my $user = DXUser->get($key);
+               my $user = DXUser::get($key);
                if ($user->is_node) {
                        $nodes ++;
                        if (grep $key eq $_, (@nodes, $mycall)) {

diff --git a/perl/update_sysop.pl b/perl/update_sysop.pl
index cec9f56ec04757c7e32e70f7dbed105d28f26b80..2fccbb5aee90c8aa2f46fa5c5412b933150b187d 100755 (executable)
--- a/perl/update_sysop.pl
+++ b/perl/update_sysop.pl
@@ -29,7 +29,7 @@ sub create_it
 {
        my $ref;
        
-       while ($ref = DXUser->get(uc $mycall)) {
+       while ($ref = DXUser::get(uc $mycall)) {
                print "old call $mycall deleted\n";
                $ref->del();
        }
@@ -55,7 +55,7 @@ sub create_it
        print "new call $mycall added\n";
 
        # now do one for the alias
-       while ($ref = DXUser->get($myalias)) {
+       while ($ref = DXUser::get($myalias)) {
                print "old call $myalias deleted\n";
                $ref->del();
        }