--- loncom/auth/lonlogin.pm 2002/03/23 21:06:54 1.15 +++ loncom/auth/lonlogin.pm 2002/09/17 20:05:39 1.19.2.1 @@ -1,7 +1,7 @@ # The LearningOnline Network # Login Screen # -# $Id: lonlogin.pm,v 1.15 2002/03/23 21:06:54 www Exp $ +# $Id: lonlogin.pm,v 1.19.2.1 2002/09/17 20:05:39 matthew Exp $ # # Copyright Michigan State University Board of Trustees # @@ -30,6 +30,8 @@ # 1/17/01 Gerd Kortemeyer # # 2/7/02,2/8,2/12,2/14,2/15,2/19 Josh Brunskole +# +# 7/10/02 Jeremy Bowers package Apache::lonlogin; @@ -46,6 +48,14 @@ sub handler { $r->send_http_header; return OK if $r->header_only; + + &Apache::loncommon::get_unprocessed_cgi + ($ENV{'QUERY_STRING'},['interface']); + + $ENV{'form.interface'}=~s/\W//g; + + my $fullgraph=($ENV{'form.interface'} ne 'textual'); + my $iconpath= $r->dir_config('lonIconsURL'); my $domain = $r->dir_config('lonDefDomain'); my $role = $r->dir_config('lonRole'); @@ -68,7 +78,7 @@ sub handler { my $firsturl=$ENV{'request.firsturl'}; # ---------------------------------------- Are we access server and overloaded? if (($role eq 'access') && ($loadpercent>100.0)) { - $otherserver=Apache::lonnet::spareserver(); + $otherserver=Apache::lonnet::spareserver($loadpercent); } # -------------------------------------------------------- Set login parameters @@ -108,7 +118,7 @@ ENDHEADER $r->print(<$jsh>); } # ---------------------------------------------------------- Serve rest of page - $r->print(<print(< @@ -130,25 +140,32 @@ ENDHEADER =crypted(this.document.client.elements.upass.value); this.document.server.submit(); + return false; } +ENDSCRIPT - - + if ($fullgraph) { + $r->print( + '
'); + } + $r->print(< + - +ENDSERVERFORM + if ($fullgraph) { $r->print(< - + @@ -158,51 +175,54 @@ ENDHEADER - + - + - + - + - + + - + @@ -269,18 +291,18 @@ ENDHEADER    System Administration:
      $sysadm
   Server Administration:
-       $servadm +       $servadm
  - + - + - + @@ -288,19 +310,19 @@ ENDHEADER - + - + - +
The Learning Online Network with CAPA
 
- + Accessibility Options
- + About LON-CAPA
- +
-
+ENDTOP +} + $r->print(< - + @@ -218,20 +238,22 @@ ENDHEADER
User Authentication

   User Name:

- +
- +ENDLOGIN + if ($fullgraph) { + $r->print(< -
Laboratory for Instructional Technology in Education
 
- - ENDDOCUMENT +} + $r->print(''); return OK; }