X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXUser.pm;h=55245a59a2a7cd2b5651dd8dd08e464c73bfe368;hb=a0cf638d2ec10e9f464bb749cf1b70fd105baf9f;hp=cdbc0b23c81c542ea3dd79b698ba8bf7b79ec074;hpb=1cf4bd14be226274d5deb05da8480ab91a5dac52;p=spider.git

diff --git a/perl/DXUser.pm b/perl/DXUser.pm
index cdbc0b23..55245a59 100644
--- a/perl/DXUser.pm
+++ b/perl/DXUser.pm
@@ -13,6 +13,10 @@ require Exporter;
 
 use MLDBM qw(DB_File);
 use Fcntl;
+use Carp;
+
+use strict;
+use vars qw(%u $dbm $filename %valid);
 
 %u = undef;
 $dbm = undef;
@@ -39,9 +43,12 @@ $filename = undef;
   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;
 sub AUTOLOAD
 {
   my $self = shift;
@@ -50,7 +57,7 @@ sub AUTOLOAD
   return if $name =~ /::DESTROY$/;
   $name =~ s/.*:://o;
   
-  die "Non-existant field '$AUTOLOAD'" if !$valid{$name};
+  confess "Non-existant field '$AUTOLOAD'" if !$valid{$name};
   if (@_) {
     $self->{$name} = shift;
 	$self->put();
@@ -65,11 +72,13 @@ 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;
 }
 
+use strict;
+
 #
 # close the system
 #
@@ -86,14 +95,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;
 }
@@ -105,10 +118,21 @@ sub new
 
 sub get
 {
-  my ($pkg, $call) = @_;
+  my $pkg = shift;
+  my $call = uc shift;
+  $call =~ s/-\d+$//o;       # strip ssid
   return $u{$call};
 }
 
+#
+# get all callsigns in the database 
+#
+
+sub get_all_calls
+{
+  return (sort keys %u);
+}
+
 #
 # get an existing either from the channel (if there is one) or from the database
 #
@@ -119,7 +143,10 @@ sub get
 
 sub get_current
 {
-  my ($pkg, $call) = @_;
+  my $pkg = shift;
+  my $call = uc shift;
+  $call =~ s/-\d+$//o;       # strip ssid
+  
   my $dxchan = DXChannel->get($call);
   return $dxchan->user if $dxchan;
   return $u{$call};