--- loncom/auth/lonlogin.pm 2003/02/19 14:05:28 1.35
+++ loncom/auth/lonlogin.pm 2003/05/08 21:50:54 1.41
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Login Screen
#
-# $Id: lonlogin.pm,v 1.35 2003/02/19 14:05:28 www Exp $
+# $Id: lonlogin.pm,v 1.41 2003/05/08 21:50:54 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -50,8 +50,9 @@ sub handler {
&Apache::loncommon::get_unprocessed_cgi
- ($ENV{'QUERY_STRING'},['interface','username','domain','firsturl']);
-
+ ($ENV{'QUERY_STRING'}.'&'.$ENV{'request.querystring'},
+ ['interface','username','domain','firsturl']);
+
# ----------------------------------------------------------- Process Interface
$ENV{'form.interface'}=~s/\W//g;
@@ -65,8 +66,11 @@ sub handler {
}
my $fullgraph=($ENV{'form.interface'} ne 'textual');
-
- my $iconpath= 'http://'.$ENV{'HTTP_HOST'}.':8080'.
+ my $port_to_use=$r->dir_config('lonhttpdPort');
+ if (!defined($port_to_use)) {
+ $port_to_use='8080';
+ }
+ my $iconpath= 'http://'.$ENV{'HTTP_HOST'}.':'.$port_to_use.
$r->dir_config('lonIconsURL');
my $domain = $r->dir_config('lonDefDomain');
my $role = $r->dir_config('lonRole');
@@ -76,6 +80,7 @@ sub handler {
my $lonhost = $r->dir_config('lonHostID');
my $tabdir = $r->dir_config('lonTabDir');
my $include = $r->dir_config('lonIncludes');
+ my $expire = $r->dir_config('lonExpire');
# --------------------------------------------- Default values for login fields
@@ -84,20 +89,22 @@ sub handler {
# ---------------------------------------------------------- Determine own load
my $loadavg;
- {
- my $loadfile=Apache::File->new('/proc/loadavg');
- $loadavg=<$loadfile>;
- }
+ {
+ my $loadfile=Apache::File->new('/proc/loadavg');
+ $loadavg=<$loadfile>;
+ }
$loadavg =~ s/\s.*//g;
my $loadpercent=100*$loadavg/$loadlim;
+ my $userloadpercent=&Apache::lonnet::userload();
# ------------------------------------------------------- Do the load balancing
my $otherserver='http://'.$ENV{'SERVER_NAME'};
my $firsturl=
($ENV{'request.firsturl'}?$ENV{'request.firsturl'}:$ENV{'form.firsturl'});
# ---------------------------------------- Are we access server and overloaded?
- if (($role eq 'access') && ($loadpercent>100.0)) {
- $otherserver=Apache::lonnet::spareserver($loadpercent);
+ if (($role eq 'access') &&
+ (($userloadpercent>100.0)||($loadpercent>100.0))) {
+ $otherserver=Apache::lonnet::spareserver($loadpercent,$userloadpercent);
}
# -------------------------------------------------------- Set login parameters
@@ -156,10 +163,14 @@ ENDTROUBLE
# ----------------------------------------------- Apparently we are in business
my $domainlogo=&Apache::loncommon::domainlogo();
+ $servadm=~s/\,/\
/g;
+ $sysadm=~s/\,/\
/g;
+
# --------------------------------------------------- Print login screen header
$r->print(<
+
The LearningOnline Network with CAPA Login
ENDHEADER
@@ -203,22 +214,22 @@ ENDHEADER
=this.document.client.elements.udom.value;
this.document.server.elements.imagesuppress.value
- =this.document.client.elements.imagesuppress.value;
+ =this.document.client.elements.imagesuppress.checked;
this.document.server.elements.embedsuppress.value
- =this.document.client.elements.embedsuppress.value;
+ =this.document.client.elements.embedsuppress.checked;
this.document.server.elements.appletsuppress.value
- =this.document.client.elements.appletsuppress.value;
+ =this.document.client.elements.appletsuppress.checked;
this.document.server.elements.fontenhance.value
- =this.document.client.elements.fontenhance.value;
+ =this.document.client.elements.fontenhance.checked;
this.document.server.elements.blackwhite.value
- =this.document.client.elements.blackwhite.value;
+ =this.document.client.elements.blackwhite.checked;
this.document.server.elements.remember.value
- =this.document.client.elements.remember.value;
+ =this.document.client.elements.remember.checked;
uextkey=this.document.client.elements.uextkey.value;
lextkey=this.document.client.elements.lextkey.value;