--- loncom/auth/lonlogin.pm 2002/02/19 21:20:48 1.12 +++ 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.12 2002/02/19 21:20:48 albertel Exp $ +# $Id: lonlogin.pm,v 1.19.2.1 2002/09/17 20:05:39 matthew Exp $ # # Copyright Michigan State University Board of Trustees # @@ -29,6 +29,10 @@ # 1/14/00,5/29,5/30,6/1,6/29,7/1,11/9, # 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; use strict; @@ -44,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'); @@ -66,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 @@ -84,7 +96,11 @@ sub handler { } my $lextkey=hex($lkey); + if ($lextkey>2147483647) { $lextkey-=4294967296; } + my $uextkey=hex($ukey); + if ($uextkey>2147483647) { $uextkey-=4294967296; } + my $logtoken=Apache::lonnet::reply( 'tmpput:'.$ukey.$lkey.'&'.$firsturl, $lonhost); @@ -102,14 +118,14 @@ ENDHEADER $r->print(<$jsh>); } # ---------------------------------------------------------- Serve rest of page - $r->print(< + $r->print(< + - function send() { + +ENDSCRIPT - + if ($fullgraph) { + $r->print( + ''); + } -Accessibility Options -   -About LON-CAPA

-

- - -
- -User Authentication

- -

- - - - - -
- -
- - - - - - + $r->print(< + + + + + + + +ENDSERVERFORM + if ($fullgraph) { $r->print(< + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Username:
Password:
Domain:
The Learning Online Network with CAPA
 
+ Accessibility Options +
+ About LON-CAPA + 		+
+ +
+
+ENDTOP +} + $r->print(< + + + + + + + + + + + + + + + + + + + + + +
User Authentication

   User Name:
   Password:
   Domain:
+
+ +
+ + +ENDLOGIN + if ($fullgraph) { + $r->print(< + + +
+
+ + + + + + + + + + + + + +
+    Domain:  + +  $domain +
+    Server:  + +  $lonhost ($role) +
+    Load:  + +  $loadpercent percent +
+
+ +    System Administration:
+       $sysadm
+    Server Administration:
+       $servadm
  + + 		Laboratory for Instructional Technology in Education
 
- - - - -
- - - - - - - - -
Domain:$domainSystem Administration:
- $sysadm
- Server Administration:
- $servadm
Server:$lonhost ($role)
Load:$loadpercent percent
-		 - -Laboratory for
-Instructional
-Technology in
-Education		 -
- - + ENDDOCUMENT +} + $r->print(''); return OK; }