From: minima <minima>
Date: Thu, 17 May 2007 15:09:07 +0000 (+0000)
Subject: login mods
X-Git-Tag: 1.54~3
X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=commitdiff_plain;h=3bf0a0d26c5173475e4e799e27db63677d86572f;p=spider.git

login mods
---

diff --git a/gtkconsole/gtkconsole b/gtkconsole/gtkconsole
index ad2d05a3..c02f8075 100755
--- a/gtkconsole/gtkconsole
+++ b/gtkconsole/gtkconsole
@@ -49,6 +49,8 @@ our ($dx, $cmd, $ann, $wcy, $wwv); # scrolling list windows
 our $bot;						# the cmd entry window
 our $date;						# the current date
 
+require "$root/local/DXVars.pm" if -e "$root/local/DXVars.pm";
+
 # read in the user data
 our $userfn = "$ENV{HOME}/.gtkconsole_data";
 our $user = read_user_data();
@@ -80,7 +82,7 @@ unless ($call && $host) {
 	my $node = $user->{clusters}->{$user->{node}};
 	
 	if ($node->{call} || $user->{call}) {
-		$call = $node->{call} || $user->{call};
+		$call = $node->{call} || $user->{call} || $main::myalias;
 		$host = $node->{passwd};
 		$host = $node->{host};
 		$port = $node->{port};
@@ -88,15 +90,13 @@ unless ($call && $host) {
 }
 
 unless ($call && $host) {
-	if (-e "$root/local/DXVars.pm") {
-		require "$root/local/DXVars.pm";
-		$call = $main::myalias;
-		$call = $main::myalias;	# for the warning
-	}
 	if (-e "$root/local/Listeners.pm") {
 		require  "$root/local/Listeners.pm";
 		$host = $main::listen->[0]->[0];
 		$port = $main::listen->[0]->[1];
+		$host ||= '127.0.0.1';
+		$host = "127.0.0.1" if $host eq '0.0.0.0';
+		$port ||= 7300;
 	}
 }
 
@@ -365,11 +365,13 @@ sub read_user_data
 		
 		$u = {
 			  clusters => {
+						   'LOCAL' => {host => '127.0.0.1', port => 7300},
 						   'GB7DJK' => {host => 'gb7djk.dxcluster.net', port => 7300},
 						   'WR3D' => {host => 'wr3d.dxcluster.net', port => 7300},
 						   'GB7BAA' => {host => 'gb7baa.dxcluster.net', port => 7300},
 						  },
-			  node => 'GB7DJK',
+			  node => 'LOCAL',
+			  call => $main::myalias,
 			 };
 		write_user_data($u);
 	}