start work on NP stuff seriously

[spider.git] / perl / DXUser.pm

diff --git a/perl/DXUser.pm b/perl/DXUser.pm
index b996e5c536bc6d377265cadbde0d8375a8f0bbea..1e06cd3c9d87fa05a243e85ac14b2c896761171b 100644 (file)
--- a/perl/DXUser.pm
+++ b/perl/DXUser.pm
@@ -28,7 +28,7 @@ use vars qw(%u $dbm $filename %valid $lastoperinterval $lasttime);
 %u = ();
 $dbm = undef;
 $filename = undef;
-$lastoperinterval = 30*24*60*60;
+$lastoperinterval = 60*24*60*60;
 $lasttime = 0;
 
 # hash of valid elements and a simple prompt
@@ -44,6 +44,7 @@ $lasttime = 0;
                  priv => '9,Privilege Level',
                  lastin => '0,Last Time in,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',
@@ -57,25 +58,29 @@ $lasttime = 0;
                  hmsgno => '0,Highest Msgno',
                  group => '0,Access Group,parray',     # used to create a group of users/nodes for some purpose or other
                  isolate => '9,Isolate network,yesno',
-                 wantbeep => '0,Rec Beep,yesno',
-                 wantann => '0,Rec Announce,yesno',
-                 wantwwv => '0,Rec WWV,yesno',
-                 wantwcy => '0,Rec WCY,yesno',
-                 wantecho => '0,Rec Echo,yesno',
-                 wanttalk => '0,Rec Talk,yesno',
-                 wantwx => '0,Rec WX,yesno',
-                 wantdx => '0,Rec DX Spots,yesno',
-                 wantemail => '0,Rec Msgs as Email,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',
                  pagelth => '0,Current Pagelth',
                  pingint => '9,Node Ping interval',
                  nopings => '9,Ping Obs Count',
                  wantlogininfo => '9,Login info req,yesno',
           wantgrid => '0,DX Grid Info,yesno',
                  wantann_talk => '0,Talklike Anns,yesno',
+                 wantpc90 => '1,Req PC90,yesno',
+                 wantnp => '1,Req New Protocol,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',
                 );
 
 no strict;
@@ -197,11 +202,9 @@ sub get_current
   
        my $dxchan = DXChannel->get($call);
        return $dxchan->user if $dxchan;
-       my $data;
-       unless ($dbm->get($call, $data)) {
-               return decode($data);
-       }
-       return undef;
+       my $rref = Route::get($call);
+       return $rref->user if $rref && exists $rref->{user};
+       return $pkg->get($call);
 }
 
 #
@@ -593,6 +596,12 @@ sub unset_passwd
        my $self = shift;
        delete $self->{passwd};
 }
+
+sub unset_passphrase
+{
+       my $self = shift;
+       delete $self->{passphrase};
+}
 1;
 __END__