X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXUser.pm;h=4af135e7e795aefe0a7a39bc2f8a189828d442df;hb=a24cc09d8262093df92c767d3010c0a5fd6e42d7;hp=e5afe25b183e4e6871b4f3bf2e66076463cc15db;hpb=5d10d2095199b0d798926fa9e79a3f580c296b67;p=spider.git

diff --git a/perl/DXUser.pm b/perl/DXUser.pm
index e5afe25b..4af135e7 100644
--- a/perl/DXUser.pm
+++ b/perl/DXUser.pm
@@ -136,17 +136,19 @@ sub init
 {
 	my $mode = shift;
   
-   $json = DXJSON->new->canonical(1);
+	$json = DXJSON->new->canonical(1);
 	my $fn = "users";
 	$filename = localdata("$fn.v3j");
-	unless (-e $filename || $mode == 2) {
-		LogDbg('DXUser', "New User File version $filename does not exist, running conversion from users.v3 or v2, please wait");
-		system('/spider/perl/convert-users-v3-to-v3j.pl');
-		init(1);
-		export();
-		return;
+	unless (-e $filename || $mode == 2 ) {
+		if (-e localdata("$fn.v3") || -e localdata("$fn.v2")) {
+			LogDbg('DXUser', "New User File version $filename does not exist, running conversion from users.v3 or v2, please wait");
+			system('/spider/perl/convert-users-v3-to-v3j.pl');
+			init(1);
+			export();
+			return;
+		}
 	}
-	if (-e $filename || $mode == 2) {
+	if (-e $filename || $mode) {
 		$lru = LRU->newbase("DXUser", $lrusize);
 		if ($mode) {
 			$dbm = tie (%u, 'DB_File', $filename, O_CREAT|O_RDWR, 0666, $DB_BTREE) or confess "can't open user file: $fn ($!) [rebuild it from user_json?]";
@@ -834,6 +836,16 @@ sub lastping
 	$b->{$call} = shift if @_;
 	return $b->{$call};	
 }
+
+sub registered
+{
+	my $self = shift;
+	if (exists $self->{registered}) {
+		return $self->{registered} || 0;
+	}
+	return '';					# to stop undef warnings
+}
+
 1;
 __END__