--- loncom/auth/lonlogin.pm 2002/09/17 20:06:34 1.24 +++ loncom/auth/lonlogin.pm 2003/02/04 15:11:44 1.30 @@ -1,7 +1,7 @@ # The LearningOnline Network # Login Screen # -# $Id: lonlogin.pm,v 1.24 2002/09/17 20:06:34 matthew Exp $ +# $Id: lonlogin.pm,v 1.30 2003/02/04 15:11:44 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -50,13 +50,14 @@ sub handler { &Apache::loncommon::get_unprocessed_cgi - ($ENV{'QUERY_STRING'},['interface']); + ($ENV{'QUERY_STRING'},['interface','username','domain']); $ENV{'form.interface'}=~s/\W//g; my $fullgraph=($ENV{'form.interface'} ne 'textual'); - my $iconpath= $r->dir_config('lonIconsURL'); + my $iconpath= 'http://'.$ENV{'HTTP_HOST'}.':8080'. + $r->dir_config('lonIconsURL'); my $domain = $r->dir_config('lonDefDomain'); my $role = $r->dir_config('lonRole'); my $loadlim = $r->dir_config('lonLoadLim'); @@ -66,6 +67,12 @@ sub handler { my $tabdir = $r->dir_config('lonTabDir'); my $include = $r->dir_config('lonIncludes'); +# --------------------------------------------- Default values for login fields + + my $authusername=($ENV{'form.username'}?$ENV{'form.username'}:''); + my $authdomain=($ENV{'form.domain'}?$ENV{'form.domain'}:$domain); + +# ---------------------------------------------------------- Determine own load my $loadavg; { my $loadfile=Apache::File->new('/proc/loadavg'); @@ -74,6 +81,7 @@ sub handler { $loadavg =~ s/\s.*//g; my $loadpercent=100*$loadavg/$loadlim; +# ------------------------------------------------------- Do the load balancing my $otherserver='http://'.$ENV{'SERVER_NAME'}; my $firsturl=$ENV{'request.firsturl'}; # ---------------------------------------- Are we access server and overloaded? @@ -134,7 +142,7 @@ ENDHEADER $r->print(< + topmargin=0 leftmargin=0 marginwidth=0 marginheight=0> + ENDDOCUMENT } $r->print('');