loncom/auth/lonlogin.pm - diff

Return to lonlogin.pm CVS log

Up to [LON-CAPA] / loncom / auth

version 1.80, 2006/09/19 19:03:08	version 1.81, 2006/09/28 00:59:02
Line 41 use lib '/home/httpd/lib/perl/';	Line 41 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 130 ENDFAILED	Line 140 ENDFAILED
$r->dir_config('lonIconsURL');	$r->dir_config('lonIconsURL');
my $domain = $r->dir_config('lonDefDomain');	my $domain = $r->dir_config('lonDefDomain');
my $testdomain=(split(/\./,$ENV{'HTTP_HOST'}))[0];	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 (lc($posdom) eq lc($testdomain)) { $domain=$posdom; }
}	}
if (($env{'form.domain'}) &&	if (($env{'form.domain'}) &&