[LON-CAPA-cvs] cvs: loncom /auth lonlogin.pm
albertel
lon-capa-cvs@mail.lon-capa.org
Tue, 30 Aug 2005 21:14:21 -0000
albertel Tue Aug 30 17:14:21 2005 EDT
Modified files:
/loncom/auth lonlogin.pm
Log:
i- include the multidomain url -> default domain code in the default line
Index: loncom/auth/lonlogin.pm
diff -u loncom/auth/lonlogin.pm:1.67 loncom/auth/lonlogin.pm:1.68
--- loncom/auth/lonlogin.pm:1.67 Tue Jun 14 16:09:13 2005
+++ loncom/auth/lonlogin.pm Tue Aug 30 17:14:20 2005
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Login Screen
#
-# $Id: lonlogin.pm,v 1.67 2005/06/14 20:09:13 albertel Exp $
+# $Id: lonlogin.pm,v 1.68 2005/08/30 21:14:20 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -108,6 +108,10 @@
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()) {
+ if ($posdom eq $testdomain) { $domain=$testdomain; }
+ }
if (($env{'form.domain'}) &&
($Apache::lonnet::domaindescription{$env{'form.domain'}})) {
$domain=$env{'form.domain'};