--- loncom/auth/lonlogin.pm 2003/07/16 20:42:31 1.43
+++ loncom/auth/lonlogin.pm 2003/08/26 19:48:41 1.44.2.2
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Login Screen
#
-# $Id: lonlogin.pm,v 1.43 2003/07/16 20:42:31 www Exp $
+# $Id: lonlogin.pm,v 1.44.2.2 2003/08/26 19:48:41 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -73,6 +73,10 @@ sub handler {
my $iconpath= 'http://'.$ENV{'HTTP_HOST'}.':'.$port_to_use.
$r->dir_config('lonIconsURL');
my $domain = $r->dir_config('lonDefDomain');
+ if (($ENV{'form.domain'}) &&
+ ($Apache::lonnet::domaindescription{$ENV{'form.domain'}})) {
+ $domain=$ENV{'form.domain'};
+ }
my $role = $r->dir_config('lonRole');
my $loadlim = $r->dir_config('lonLoadLim');
my $servadm = $r->dir_config('lonAdmEMail');
@@ -81,6 +85,7 @@ sub handler {
my $tabdir = $r->dir_config('lonTabDir');
my $include = $r->dir_config('lonIncludes');
my $expire = $r->dir_config('lonExpire');
+ my $version = $r->dir_config('lonVersion');
# --------------------------------------------- Default values for login fields
@@ -104,7 +109,8 @@ sub handler {
# ---------------------------------------- Are we access server and overloaded?
if (($role eq 'access') &&
(($userloadpercent>100.0)||($loadpercent>100.0))) {
- $otherserver=Apache::lonnet::spareserver($loadpercent,$userloadpercent);
+ my $unloaded=Apache::lonnet::spareserver($loadpercent,$userloadpercent);
+ if ($unloaded) { $otherserver=$unloaded; }
}
# -------------------------------------------------------- Set login parameters
@@ -182,20 +188,20 @@ ENDHEADER
# ----------------------------------------------------------- Front page design
my $pgbg=
- ($fullgraph?&Apache::loncommon::designparm('login.pgbg'):'#FFFFFF');
+ ($fullgraph?&Apache::loncommon::designparm('login.pgbg',$domain):'#FFFFFF');
my $font=
- ($fullgraph?&Apache::loncommon::designparm('login.font'):'#000000');
+ ($fullgraph?&Apache::loncommon::designparm('login.font',$domain):'#000000');
my $link=
- ($fullgraph?&Apache::loncommon::designparm('login.link'):'#0000FF');
+ ($fullgraph?&Apache::loncommon::designparm('login.link',$domain):'#0000FF');
my $vlink=
- ($fullgraph?&Apache::loncommon::designparm('login.vlink'):'#0000FF');
- my $alink=&Apache::loncommon::designparm('login.alink');
+ ($fullgraph?&Apache::loncommon::designparm('login.vlink',$domain):'#0000FF');
+ my $alink=&Apache::loncommon::designparm('login.alink',$domain);
my $mainbg=
- ($fullgraph?&Apache::loncommon::designparm('login.mainbg'):'#FFFFFF');
+ ($fullgraph?&Apache::loncommon::designparm('login.mainbg',$domain):'#FFFFFF');
my $sidebg=
- ($fullgraph?&Apache::loncommon::designparm('login.sidebg'):'#FFFFFF');
- my $logo=&Apache::loncommon::designparm('login.logo');
- my $img=&Apache::loncommon::designparm('login.img');
+ ($fullgraph?&Apache::loncommon::designparm('login.sidebg',$domain):'#FFFFFF');
+ my $logo=&Apache::loncommon::designparm('login.logo',$domain);
+ my $img=&Apache::loncommon::designparm('login.img',$domain);
# ---------------------------------------------------------- Serve rest of page
@@ -432,7 +438,8 @@ ENDLOGIN
System Administration:
$sysadm
Server Administration:
- $servadm
+ $servadm
+ $version