X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXUser.pm;h=0af77f04df235d0da9e136dc5e7df3eb4f8856fa;hb=e00a697bdb9f7c066b3e921d4f8ccc9bb9cf7485;hp=08c5824a7f4f1b8508ff263c0452eaf25d92a5ce;hpb=0824a94355e5fb2b4c379bb013d66466725629f5;p=spider.git

diff --git a/perl/DXUser.pm b/perl/DXUser.pm
index 08c5824a..0af77f04 100644
--- a/perl/DXUser.pm
+++ b/perl/DXUser.pm
@@ -39,11 +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? 
+  reg => '0,Registered?,yesno',            # is this user registered?
+  lang => '0,Language',
+  hmsgno => '0,Highest Msgno',
 );
 
 no strict;
@@ -70,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;
 }
 
@@ -93,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;
 }
@@ -114,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};
 }
 
@@ -124,7 +131,7 @@ sub get
 
 sub get_all_calls
 {
-  return keys %u;
+  return (sort keys %u);
 }
 
 #
@@ -139,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;