--- loncom/auth/lonlogin.pm 2006/09/28 00:59:02 1.81 +++ loncom/auth/lonlogin.pm 2007/01/14 02:00:04 1.87 @@ -1,7 +1,7 @@ # The LearningOnline Network # Login Screen # -# $Id: lonlogin.pm,v 1.81 2006/09/28 00:59:02 albertel Exp $ +# $Id: lonlogin.pm,v 1.87 2007/01/14 02:00:04 raeburn 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; @@ -84,8 +73,7 @@ sub handler { my $lonid=$cookies{'lonID'}; my $cookie; if ($lonid) { - my $handle=$lonid->value; - $handle=~s/\W//g; + my $handle=&LONCAPA::clean_handle($lonid->value); my $lonidsdir=$r->dir_config('lonIDsDir'); if (-e "$lonidsdir/$handle.id") { # Is there an existing token file? @@ -138,20 +126,13 @@ 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'}; } my $role = $r->dir_config('lonRole'); my $loadlim = $r->dir_config('lonLoadLim'); - my $servadm = $r->dir_config('lonAdmEMail'); - my $sysadm = $r->dir_config('lonSysEMail'); my $lonhost = $r->dir_config('lonHostID'); my $tabdir = $r->dir_config('lonTabDir'); my $include = $r->dir_config('lonIncludes'); @@ -254,7 +235,6 @@ ENDFAILED
Please attempt to login to one of the following servers:
$spares -If the problem persists, please contact $servadm.