loncom/auth/lonlogin.pm - diff

Return to lonlogin.pm CVS log

Up to [LON-CAPA] / loncom / auth

version 1.86, 2007/01/13 20:39:57	version 1.87, 2007/01/14 02:00:04
Line 40 use Apache::migrateuser();	Line 40 use Apache::migrateuser();
use lib '/home/httpd/lib/perl/';	use lib '/home/httpd/lib/perl/';
use LONCAPA;	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 {	sub handler {
my $r = shift;	my $r = shift;

Line 137 ENDFAILED	Line 126 ENDFAILED
}	}
my $iconpath= 'http://'.$ENV{'HTTP_HOST'}.':'.$port_to_use.	my $iconpath= 'http://'.$ENV{'HTTP_HOST'}.':'.$port_to_use.
$r->dir_config('lonIconsURL');	$r->dir_config('lonIconsURL');
my $domain = $r->dir_config('lonDefDomain');	my $domain = &Apache::lonnet::default_login_domain();
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; }
}
if (($env{'form.domain'}) &&	if (($env{'form.domain'}) &&
($Apache::lonnet::domaindescription{$env{'form.domain'}})) {	($Apache::lonnet::domaindescription{$env{'form.domain'}})) {
$domain=$env{'form.domain'};	$domain=$env{'form.domain'};