I think I have most the SSID probs cracked.

[spider.git] / perl / DXUser.pm

diff --git a/perl/DXUser.pm b/perl/DXUser.pm
index f2273a7a4d24dd95454d4b69421b75bd781c297f..0af77f04df235d0da9e136dc5e7df3eb4f8856fa 100644 (file)
--- a/perl/DXUser.pm
+++ b/perl/DXUser.pm
@@ -39,12 +39,14 @@ $filename = undef;
   sort => '0,Type of User',                # A - ak1a, U - User, S - spider cluster, B - BBS
   xpert => '0,Expert Status,yesno',
   bbs => '0,Home BBS',
-  node => '0,Home Node',
+  node => '0,Last Node',
+  homenode => '0,Home Node',
   lockout => '9,Locked out?,yesno',        # won't let them in at all
   dxok => '9,DX Spots?,yesno',            # accept his dx spots?
   annok => '9,Announces?,yesno',            # accept his announces?
   reg => '0,Registered?,yesno',            # is this user registered?
   lang => '0,Language',
+  hmsgno => '0,Highest Msgno',
 );
 
 no strict;
@@ -71,8 +73,8 @@ sub init
 {
   my ($pkg, $fn) = @_;
   
-  die "need a filename in User" if !$fn;
-  $dbm = tie (%u, MLDBM, $fn, O_CREAT|O_RDWR, 0666) or die "can't open user file: $fn ($!)";
+  confess "need a filename in User" if !$fn;
+  $dbm = tie (%u, MLDBM, $fn, O_CREAT|O_RDWR, 0666) or confess "can't open user file: $fn ($!)";
   $filename = $fn;
 }
 
@@ -94,14 +96,18 @@ sub finish
 
 sub new
 {
-  my ($pkg, $call) = @_;
-  die "can't create existing call $call in User\n!" if $u{$call};
+  my $pkg = shift;
+  my $call = uc shift;
+#  $call =~ s/-\d+$//o;
+  
+  confess "can't create existing call $call in User\n!" if $u{$call};
 
   my $self = {};
   $self->{call} = $call;
   $self->{sort} = 'U';
   $self->{dxok} = 1;
   $self->{annok} = 1;
+  $self->{lang} = $main::lang;
   bless $self, $pkg;
   $u{call} = $self;
 }
@@ -115,7 +121,7 @@ sub get
 {
   my $pkg = shift;
   my $call = uc shift;
-  $call =~ s/-\d+//o;       # strip ssid
+#  $call =~ s/-\d+$//o;       # strip ssid
   return $u{$call};
 }
 
@@ -125,7 +131,7 @@ sub get
 
 sub get_all_calls
 {
-  return keys %u;
+  return (sort keys %u);
 }
 
 #
@@ -140,7 +146,7 @@ sub get_current
 {
   my $pkg = shift;
   my $call = uc shift;
-  $call =~ s/-\d+//o;       # strip ssid
+#  $call =~ s/-\d+$//o;       # strip ssid
   
   my $dxchan = DXChannel->get($call);
   return $dxchan->user if $dxchan;