--- loncom/auth/lonlogin.pm 2006/12/05 02:55:56 1.85
+++ loncom/auth/lonlogin.pm 2007/03/02 23:17:48 1.88
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Login Screen
#
-# $Id: lonlogin.pm,v 1.85 2006/12/05 02:55:56 albertel Exp $
+# $Id: lonlogin.pm,v 1.88 2007/03/02 23:17:48 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -40,17 +40,6 @@ use Apache::migrateuser();
use lib '/home/httpd/lib/perl/';
use LONCAPA;
-
-sub additional_machine_domains {
- my @domains;
- open(my $fh,"<".$Apache::lonnet::perlvar{'lonTabDir'}.'/expected_domains.tab');
- while( my $line = <$fh>) {
- $line =~ s/\s//g;
- push(@domains,$line);
- }
- return @domains;
-}
-
sub handler {
my $r = shift;
@@ -137,12 +126,7 @@ ENDFAILED
}
my $iconpath= 'http://'.$ENV{'HTTP_HOST'}.':'.$port_to_use.
$r->dir_config('lonIconsURL');
- my $domain = $r->dir_config('lonDefDomain');
- my $testdomain=(split(/\./,$ENV{'HTTP_HOST'}))[0];
- foreach my $posdom (&Apache::lonnet::current_machine_domains(),
- &additional_machine_domains()) {
- if (lc($posdom) eq lc($testdomain)) { $domain=$posdom; }
- }
+ my $domain = &Apache::lonnet::default_login_domain();
if (($env{'form.domain'}) &&
($Apache::lonnet::domaindescription{$env{'form.domain'}})) {
$domain=$env{'form.domain'};
@@ -154,7 +138,7 @@ ENDFAILED
my $include = $r->dir_config('lonIncludes');
my $expire = $r->dir_config('lonExpire');
my $version = $r->dir_config('lonVersion');
- my $host_name = $Apache::lonnet::hostname{$lonhost};
+ my $host_name = &Apache::lonnet::hostname($lonhost);
# --------------------------------------------- Default values for login fields
@@ -216,33 +200,36 @@ ENDFAILED
my $last;
foreach my $hostid (sort
{
- $Apache::lonnet::hostname{$a} cmp
- $Apache::lonnet::hostname{$b};
+ &Apache::lonnet::hostname($a) cmp
+ &Apache::lonnet::hostname($b);
}
keys(%Apache::lonnet::spareid)) {
next if ($hostid eq $lonhost);
- next if ($last eq $Apache::lonnet::hostname{$hostid});
+ my $hostname = &Apache::lonnet::hostname($hostid);
+ next if ($last eq $hostname);
$spares.='
'.
- $Apache::lonnet::hostname{$hostid}.''.
+ $hostname.''.
' (preferred)'.$/;
- $last=$Apache::lonnet::hostname{$hostid};
+ $last=$hostname;
}
$spares.= '
';
+ my %all_hostnames = &Apache::lonnet::all_hostnames();
foreach my $hostid (sort
{
- $Apache::lonnet::hostname{$a} cmp
- $Apache::lonnet::hostname{$b};
+ &Apache::lonnet::hostname($a) cmp
+ &Apache::lonnet::hostname($b);
}
- keys(%Apache::lonnet::hostname)) {
+ keys(%all_hostnames)) {
next if ($hostid eq $lonhost || $Apache::lonnet::spareid{$hostid});
- next if ($last eq $Apache::lonnet::hostname{$hostid});
+ my $hostname = &Apache::lonnet::hostname($hostid);
+ next if ($last eq $hostname);
$spares.='
'.
- $Apache::lonnet::hostname{$hostid}.'';
- $last=$Apache::lonnet::hostname{$hostid};
+ $hostname.'';
+ $last=$hostname;
}
$r->print(<
@@ -419,24 +406,25 @@ ENDSERVERFORM
-
+ |
+
+
+ |
 |