--- loncom/auth/lonlogin.pm 2002/05/25 21:46:15 1.17 +++ loncom/auth/lonlogin.pm 2003/01/16 01:37:26 1.28 @@ -1,7 +1,7 @@ # The LearningOnline Network # Login Screen # -# $Id: lonlogin.pm,v 1.17 2002/05/25 21:46:15 www Exp $ +# $Id: lonlogin.pm,v 1.28 2003/01/16 01:37:26 www 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; @@ -50,9 +52,12 @@ sub handler { &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 $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'); @@ -74,7 +79,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 @@ -100,7 +105,7 @@ sub handler { my $logtoken=Apache::lonnet::reply( 'tmpput:'.$ukey.$lkey.'&'.$firsturl, $lonhost); - + my $domainlogo=&Apache::loncommon::domainlogo(); # --------------------------------------------------- Print login screen header $r->print(< @@ -113,11 +118,24 @@ ENDHEADER my $jsh=Apache::File->new($include."/londes.js"); $r->print(<$jsh>); } + +# ----------------------------------------------------------- Front page design + my $pgbg=&Apache::loncommon::designparm('login.pgbg'); + my $font=&Apache::loncommon::designparm('login.font'); + my $link=&Apache::loncommon::designparm('login.link'); + my $vlink=&Apache::loncommon::designparm('login.vlink'); + my $alink=&Apache::loncommon::designparm('login.alink'); + my $mainbg=&Apache::loncommon::designparm('login.mainbg'); + my $sidebg=&Apache::loncommon::designparm('login.sidebg'); + my $logo=&Apache::loncommon::designparm('login.logo'); + my $img=&Apache::loncommon::designparm('login.img'); + + # ---------------------------------------------------------- Serve rest of page $r->print(< + ENDSCRIPT @@ -160,80 +179,81 @@ ENDSERVERFORM - + The Learning Online Network with CAPA -   +   - + - + - + - - + + Accessibility Options
- + About LON-CAPA - + - +
- +
- + - + ENDTOP } $r->print(< +
- + - - + + - - + + - - + + - +
User Authentication

   User Name:

   User Name:
   Password:   Password:
   Domain:   Domain:
+    Help
- +
@@ -245,38 +265,38 @@ ENDLOGIN - + - + - +
- - - - - - @@ -286,35 +306,42 @@ ENDLOGIN    System Administration:
      $sysadm
   Server Administration:
-       $servadm +       $servadm
  - + - + - + - + - + - + - +
+    Domain:  +  $domain
+    Server:  +  $lonhost ($role)
+    Load:  +  $loadpercent percent
+$domainlogo +
  
+ + ENDDOCUMENT } $r->print('');