--- loncom/auth/lonlogin.pm 2003/08/25 15:24:43 1.46 +++ loncom/auth/lonlogin.pm 2003/09/17 13:47:55 1.52 @@ -1,7 +1,7 @@ # The LearningOnline Network # Login Screen # -# $Id: lonlogin.pm,v 1.46 2003/08/25 15:24:43 www Exp $ +# $Id: lonlogin.pm,v 1.52 2003/09/17 13:47:55 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -40,6 +40,8 @@ use Apache::Constants qw(:common); use Apache::File (); use Apache::lonnet(); use Apache::loncommon(); +use Apache::lonauth(); +use Apache::lonlocal; sub handler { my $r = shift; @@ -49,10 +51,20 @@ sub handler { return OK if $r->header_only; +# Are we re-routing? + if (-e '/home/httpd/html/lon-status/reroute.txt') { + &Apache::lonauth::reroute($r); + return OK; + } + &Apache::loncommon::get_unprocessed_cgi ($ENV{'QUERY_STRING'}.'&'.$ENV{'request.querystring'}, ['interface','username','domain','firsturl','localpath','localres']); +# -------------------------------------------------------------------- Language + + &Apache::lonlocal::get_language_handle(); + # ----------------------------------------------------------- Process Interface $ENV{'form.interface'}=~s/\W//g; @@ -109,7 +121,8 @@ sub handler { # ---------------------------------------- Are we access server and overloaded? if (($role eq 'access') && (($userloadpercent>100.0)||($loadpercent>100.0))) { - $otherserver=Apache::lonnet::spareserver($loadpercent,$userloadpercent); + my $unloaded=Apache::lonnet::spareserver($loadpercent,$userloadpercent); + if ($unloaded) { $otherserver=$unloaded; } } # ----------------------------------------------------------- Get announcements @@ -169,7 +182,7 @@ ENDTROUBLE # ----------------------------------------------- Apparently we are in business - my $domainlogo=&Apache::loncommon::domainlogo(); + my $domainlogo=&Apache::loncommon::domainlogo($domain); $servadm=~s/\,/\
/g; $sysadm=~s/\,/\
/g; @@ -204,6 +217,24 @@ ENDHEADER my $logo=&Apache::loncommon::designparm('login.logo',$domain); my $img=&Apache::loncommon::designparm('login.img',$domain); +# ----------------------------------------------------------------------- Texts + +my %lt=&Apache::lonlocal::texthash( + 'un' => 'Username', + 'pw' => 'Password', + 'dom' => 'Domain', + 'perc' => 'percent', + 'load' => 'Load', + 'userload' => 'User Load', + 'about' => 'aboutlon.gif', + 'access' => 'accessbutton.gif', + 'auth' => 'userauthentication.gif', + 'log' => 'Log in', + 'help' => 'Help', + 'serv' => 'Server', + 'servadm' => 'Server Administration', + 'sysadm' => 'System Administration'); + # ---------------------------------------------------------- Serve rest of page $r->print(< - Accessibility Options + Accessibility Options
- About LON-CAPA + About LON-CAPA @@ -361,24 +392,24 @@ ENDNOOPT - + - + - + - + - +
User Authentication
User Authentication

   User Name:
   $lt{'un'}:
   Password:   $lt{'pw'}:
   Domain:   $lt{'dom'}:
   Help   $lt{'help'}
- +
@@ -406,7 +437,7 @@ ENDLOGIN
-    Domain:  +    $lt{'dom'}:   $domain @@ -414,7 +445,7 @@ ENDLOGIN
-    Server:  +    $lt{'serv'}:   $lonhost ($role) @@ -422,26 +453,26 @@ ENDLOGIN
-    Load:  +    $lt{'load'}:  -  $loadpercent percent +  $loadpercent $lt{'perc'}
-    User Load:  +    $lt{'userload'}:  -  $userloadpercent percent +  $userloadpercent $lt{'perc'}

-    System Administration:
+    $lt{'sysadm'}:
      $sysadm
-    Server Administration:
+    $lt{'servadm'}:
      $servadm
 
   $version