--- loncom/auth/lonlogin.pm 2006/09/19 19:03:08 1.80 +++ loncom/auth/lonlogin.pm 2007/01/13 20:39:57 1.86 @@ -1,7 +1,7 @@ # The LearningOnline Network # Login Screen # -# $Id: lonlogin.pm,v 1.80 2006/09/19 19:03:08 albertel Exp $ +# $Id: lonlogin.pm,v 1.86 2007/01/13 20:39:57 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -41,6 +41,16 @@ 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; @@ -74,8 +84,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? @@ -130,7 +139,8 @@ ENDFAILED $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()) { + foreach my $posdom (&Apache::lonnet::current_machine_domains(), + &additional_machine_domains()) { if (lc($posdom) eq lc($testdomain)) { $domain=$posdom; } } if (($env{'form.domain'}) && @@ -139,8 +149,6 @@ ENDFAILED } 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'); @@ -243,7 +251,6 @@ ENDFAILED
Please attempt to login to one of the following servers:
$spares -If the problem persists, please contact $servadm.