remove duplicate fields in DXUser to match DXuser

[spider.git] / perl / DXUser.pm

diff --git a/perl/DXUser.pm b/perl/DXUser.pm
index d147d68afe29fed5aa5ecfa47a2cd24ca6348dfd..b5f56c2a442f1ab52de8af97b1fa855a6ae8d8e9 100644 (file)
--- a/perl/DXUser.pm
+++ b/perl/DXUser.pm
@@ -42,69 +42,47 @@ my $json;
 # hash of valid elements and a simple prompt
 %valid = (
                  'sort' => '0,Type of User', # A - ak1a, U - User, S - spider cluster, B - BBS
-                 K => '9,Seen on PC92 K,yesno',
-                 addr => '0,Full Address',
                  addr => '0,Full Address',
                  alias => '0,Real Callsign',
-                 alias => '0,Real Callsign',
                  annok => '9,Accept Announces?,yesno', # accept his announces?
                  bbs => '0,Home BBS',
                  believe => '1,Believable nodes,parray',
-                 believe => '1,Believable nodes,parray',
                  buddies => '0,Buddies,parray',
                  build => '1,Build',
-                 build => '1,Build',
-                 call => '0,Callsign',
                  call => '0,Callsign',
                  connlist => '1,Connections,parraydifft',
                  dxok => '9,Accept DX Spots?,yesno', # accept his dx spots?
                  email => '0,E-mail Address,parray',
-                 email => '0,E-mail Address,parray',
                  group => '0,Group,parray',    # used to create a group of users/nodes for some purpose or other
                  hmsgno => '0,Highest Msgno',
                  homenode => '0,Home Node',
                  isolate => '9,Isolate network,yesno',
+                 K => '9,Seen on PC92 K,yesno',
                  lang => '0,Language',
                  lastin => '0,Last Time in,cldatetime',
-                 lastin => '0,Last Time in,cldatetime',
-                 lastoper => '9,Last for/oper,cldatetime',
                  lastoper => '9,Last for/oper,cldatetime',
                  lastping => '1,Last Ping at,ptimelist',
-                 lastping => '1,Last Ping at,ptimelist',
                  lastseen => '0,Last Seen,cldatetime',
                  lat => '0,Latitude,slat',
-                 lat => '0,Latitude,slat',
                  lockout => '9,Locked out?,yesno',     # won't let them in at all
                  long => '0,Longitude,slong',
-                 long => '0,Longitude,slong',
-                 maxconnect => '1,Max Connections',
                  maxconnect => '1,Max Connections',
                  name => '0,Name',
-                 name => '0,Name',
                  node => '0,Last Node',
                  nopings => '9,Ping Obs Count',
                  nothere => '0,Not Here Text',
-                 nothere => '0,Not Here Text',
                  pagelth => '0,Current Pagelth',
                  passphrase => '9,Pass Phrase,yesno',
-                 passphrase => '9,Pass Phrase,yesno',
-                 passwd => '9,Password,yesno',
                  passwd => '9,Password,yesno',
                  pingint => '9,Node Ping interval',
                  priv => '9,Privilege Level',
-                 priv => '9,Privilege Level',
                  prompt => '0,Required Prompt',
-                 prompt => '0,Required Prompt',
-                 qra => '0,Locator',
                  qra => '0,Locator',
                  qth => '0,Home QTH',
-                 qth => '0,Home QTH',
                  rbnseeme => '0,RBN See Me',
                  registered => '9,Registered?,yesno',
-                 registered => '9,Registered?,yesno',
                  startt => '0,Start Time,cldatetime',
                  version => '1,Version',
-                 version => '1,Version',
                  wantann => '0,Req Announce,yesno',
                  wantann_talk => '0,Talklike Anns,yesno',
                  wantbeacon => '0,Want RBN Beacon,yesno',
@@ -131,7 +109,6 @@ my $json;
                  wantwwv => '0,Req WWV,yesno',
                  wantwx => '0,Req WX,yesno',
                  width => '0,Preferred Width',
-                 width => '0,Preferred Width',
                  xpert => '0,Expert Status,yesno',
           wantgrid => '0,Show DX Grid,yesno',
                 );
@@ -919,19 +896,19 @@ sub lastping
        return $b->{$call};     
 }
 
-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
-}
+#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__