--- loncom/auth/lonlogin.pm 2006/11/15 00:53:48 1.84
+++ 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.84 2006/11/15 00:53:48 raeburn 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,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'};
@@ -420,24 +403,25 @@ ENDSERVERFORM
- |
+ |
+
+
+ |
 |