X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXUser.pm;h=ef4475625499475af86b805324602c50a082097c;hb=56fd7417545aa9de3101434bc88156b5eebb37ab;hp=a4283c33fb984e81450dbfe750f2ce4d7797e7eb;hpb=710e02b70cb2530802812577229cd62a50da8090;p=spider.git

diff --git a/perl/DXUser.pm b/perl/DXUser.pm
index a4283c33..ef447562 100644
--- a/perl/DXUser.pm
+++ b/perl/DXUser.pm
@@ -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;
@@ -899,10 +899,15 @@ sub lastping
 sub registered
 {
 	my $self = shift;
+	my $val;
+	if (defined $_[0]) {
+		$val = unpad($_[0]);
+		$self->{registered} = $val;
+	}
 	if (exists $self->{registered}) {
-		return $self->{registered} || 0;
+		$val = $self->{registered} // 0;
 	}
-	return '';					# to stop undef warnings
+	return $val // 0 ;					# to stop undef warnings
 }
 
 1;