remove duplicate fields in DXUser to match DXuser
[spider.git] / perl / DXUser.pm
index a4283c33fb984e81450dbfe750f2ce4d7797e7eb..b5f56c2a442f1ab52de8af97b1fa855a6ae8d8e9 100644 (file)
@@ -41,75 +41,76 @@ my $json;
 
 # hash of valid elements and a simple prompt
 %valid = (
-                 call => '0,Callsign',
-                 alias => '0,Real Callsign',
-                 name => '0,Name',
-                 qth => '0,Home QTH',
-                 lat => '0,Latitude,slat',
-                 long => '0,Longitude,slong',
-                 qra => '0,Locator',
-                 email => '0,E-mail Address,parray',
-                 priv => '9,Privilege Level',
-                 lastin => '0,Last Time in,cldatetime',
-                 lastseen => '0,Last Seen,cldatetime',
-                 passwd => '9,Password,yesno',
-                 passphrase => '9,Pass Phrase,yesno',
-                 addr => '0,Full Address',
                  'sort' => '0,Type of User', # A - ak1a, U - User, S - spider cluster, B - BBS
-                 xpert => '0,Expert Status,yesno',
+                 addr => '0,Full Address',
+                 alias => '0,Real Callsign',
+                 annok => '9,Accept Announces?,yesno', # accept his announces?
                  bbs => '0,Home BBS',
-                 node => '0,Last Node',
-                 homenode => '0,Home Node',
-                 lockout => '9,Locked out?,yesno',     # won't let them in at all
+                 believe => '1,Believable nodes,parray',
+                 buddies => '0,Buddies,parray',
+                 build => '1,Build',
+                 call => '0,Callsign',
+                 connlist => '1,Connections,parraydifft',
                  dxok => '9,Accept DX Spots?,yesno', # accept his dx spots?
-                 annok => '9,Accept Announces?,yesno', # accept his announces?
-                 lang => '0,Language',
-                 hmsgno => '0,Highest Msgno',
+                 email => '0,E-mail Address,parray',
                  group => '0,Group,parray',    # used to create a group of users/nodes for some purpose or other
-                 buddies => '0,Buddies,parray',
+                 hmsgno => '0,Highest Msgno',
+                 homenode => '0,Home Node',
                  isolate => '9,Isolate network,yesno',
-                 wantbeep => '0,Req Beep,yesno',
-                 wantann => '0,Req Announce,yesno',
-                 wantwwv => '0,Req WWV,yesno',
-                 wantwcy => '0,Req WCY,yesno',
-                 wantecho => '0,Req Echo,yesno',
-                 wanttalk => '0,Req Talk,yesno',
-                 wantwx => '0,Req WX,yesno',
-                 wantdx => '0,Req DX Spots,yesno',
-                 wantemail => '0,Req Msgs as Email,yesno',
+                 K => '9,Seen on PC92 K,yesno',
+                 lang => '0,Language',
+                 lastin => '0,Last Time in,cldatetime',
+                 lastoper => '9,Last for/oper,cldatetime',
+                 lastping => '1,Last Ping at,ptimelist',
+                 lastseen => '0,Last Seen,cldatetime',
+                 lat => '0,Latitude,slat',
+                 lockout => '9,Locked out?,yesno',     # won't let them in at all
+                 long => '0,Longitude,slong',
+                 maxconnect => '1,Max Connections',
+                 name => '0,Name',
+                 node => '0,Last Node',
+                 nopings => '9,Ping Obs Count',
+                 nothere => '0,Not Here Text',
                  pagelth => '0,Current Pagelth',
+                 passphrase => '9,Pass Phrase,yesno',
+                 passwd => '9,Password,yesno',
                  pingint => '9,Node Ping interval',
-                 nopings => '9,Ping Obs Count',
-                 wantlogininfo => '0,Login Info Req,yesno',
-          wantgrid => '0,Show DX Grid,yesno',
+                 priv => '9,Privilege Level',
+                 prompt => '0,Required Prompt',
+                 qra => '0,Locator',
+                 qth => '0,Home QTH',
+                 rbnseeme => '0,RBN See Me',
+                 registered => '9,Registered?,yesno',
+                 startt => '0,Start Time,cldatetime',
+                 version => '1,Version',
+                 wantann => '0,Req Announce,yesno',
                  wantann_talk => '0,Talklike Anns,yesno',
-                 wantpc16 => '9,Want Users from node,yesno',
-                 wantsendpc16 => '9,Send PC16,yesno',
-                 wantroutepc19 => '9,Route PC19,yesno',
-                 wantusstate => '0,Show US State,yesno',
+                 wantbeacon => '0,Want RBN Beacon,yesno',
+                 wantbeep => '0,Req Beep,yesno',
+                 wantcw => '0,Want RBN CW,yesno',
+                 wantdx => '0,Req DX Spots,yesno',
                  wantdxcq => '0,Show CQ Zone,yesno',
                  wantdxitu => '0,Show ITU Zone,yesno',
+                 wantecho => '0,Req Echo,yesno',
+                 wantemail => '0,Req Msgs as Email,yesno',
+                 wantft => '0,Want RBN FT4/8,yesno',
                  wantgtk => '0,Want GTK interface,yesno',
+                 wantlogininfo => '0,Login Info Req,yesno',
+                 wantpc16 => '9,Want Users from node,yesno',
                  wantpc9x => '0,Want PC9X interface,yesno',
+                 wantpsk => '0,Want RBN PSK,yesno',
                  wantrbn => '0,Want RBN spots,yesno',
-                 wantft => '0,Want RBN FT4/8,yesno',
-                 wantcw => '0,Want RBN CW,yesno',
+                 wantroutepc19 => '9,Route PC19,yesno',
                  wantrtty => '0,Want RBN RTTY,yesno',
-                 wantpsk => '0,Want RBN PSK,yesno',
-                 wantbeacon => '0,Want RBN Beacon,yesno',
-                 lastoper => '9,Last for/oper,cldatetime',
-                 nothere => '0,Not Here Text',
-                 registered => '9,Registered?,yesno',
-                 prompt => '0,Required Prompt',
-                 version => '1,Version',
-                 build => '1,Build',
-                 believe => '1,Believable nodes,parray',
-                 lastping => '1,Last Ping at,ptimelist',
-                 maxconnect => '1,Max Connections',
-                 startt => '0,Start Time,cldatetime',
-                 connlist => '1,Connections,parraydifft',
+                 wantsendpc16 => '9,Send PC16,yesno',
+                 wanttalk => '0,Req Talk,yesno',
+                 wantusstate => '0,Show US State,yesno',
+                 wantwcy => '0,Req WCY,yesno',
+                 wantwwv => '0,Req WWV,yesno',
+                 wantwx => '0,Req WX,yesno',
                  width => '0,Preferred Width',
-                 rbnseeme => '0,RBN See Me',
+                 xpert => '0,Expert Status,yesno',
+          wantgrid => '0,Show DX Grid,yesno',
                 );
 
 #no strict;
@@ -235,7 +236,6 @@ sub get
        # search for it
        unless ($dbm->get($call, $data)) {
                eval { $ref = decode($data); };
-               
                if ($ref) {
                        if (!UNIVERSAL::isa($ref, 'DXUser')) {
                                dbg("DXUser::get: got strange answer from decode of $call". ref $ref. " ignoring");
@@ -499,7 +499,7 @@ print "There are $count user records and $err errors in $diff mS\n";
                                $t //= 0;
                                
                                if ($ref->is_user) {
-                                       if ($ref->{priv} == 0 && $main::systime > $t + $tooold) {
+                                       if (!$ref->{priv} && $main::systime > $t + $tooold) {
                                                unless (($ref->{lat} && $ref->{long}) || $ref->{qth} || $ref->{name} || $ref->{qra}) {
                                                        LogDbg('DXCommand', sprintf("$ref->{call} deleted, empty and too Old at %s", difft($t, ' ')));
                                                        ++$del;
@@ -517,7 +517,7 @@ print "There are $count user records and $err errors in $diff mS\n";
                                                dbg(carp("Export Error2: delete '$key' => '$val' $@")) if $@;
                                                next;
                                        }
-                                       if ($ref->{lockout} == 1 && $ref->{priv} == 1) {
+                                       if (exists $ref->{lockout} && $ref->{lockout} == 1 && exists $ref->{priv} && $ref->{priv} == 1) {
                                                LogDbg('DXCommand', "$ref->{call} depriv'd and unlocked");
                                                $ref->{lockout} = $ref->{priv} = 0;
                                                $ref->put;
@@ -896,14 +896,19 @@ sub lastping
        return $b->{$call};     
 }
 
-sub registered
-{
-       my $self = shift;
-       if (exists $self->{registered}) {
-               return $self->{registered} || 0;
-       }
-       return '';                                      # to stop undef warnings
-}
+#sub registered
+#{
+#      my $self = shift;
+#      my $val;
+#      if (defined $_[0]) {
+#              $val = unpad($_[0]);
+#              $self->{registered} = $val;
+#      }
+#      if (exists $self->{registered}) {
+#              $val = $self->{registered} // 0;
+#      }
+#      return $val // 0 ;                                      # to stop undef warnings
+#}
 
 1;
 __END__