--- loncom/auth/lonlogin.pm 2003/05/08 21:50:54 1.41 +++ 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.41 2003/05/08 21:50:54 albertel 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']); + ['interface','username','domain','firsturl','localpath','localres']); +# -------------------------------------------------------------------- Language + + &Apache::lonlocal::get_language_handle(); + # ----------------------------------------------------------- Process Interface $ENV{'form.interface'}=~s/\W//g; @@ -73,6 +85,10 @@ sub handler { my $iconpath= 'http://'.$ENV{'HTTP_HOST'}.':'.$port_to_use. $r->dir_config('lonIconsURL'); my $domain = $r->dir_config('lonDefDomain'); + if (($ENV{'form.domain'}) && + ($Apache::lonnet::domaindescription{$ENV{'form.domain'}})) { + $domain=$ENV{'form.domain'}; + } my $role = $r->dir_config('lonRole'); my $loadlim = $r->dir_config('lonLoadLim'); my $servadm = $r->dir_config('lonAdmEMail'); @@ -81,6 +97,7 @@ sub handler { my $tabdir = $r->dir_config('lonTabDir'); my $include = $r->dir_config('lonIncludes'); my $expire = $r->dir_config('lonExpire'); + my $version = $r->dir_config('lonVersion'); # --------------------------------------------- Default values for login fields @@ -104,9 +121,12 @@ 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 + my $announcements=&Apache::lonnet::getannounce(); # -------------------------------------------------------- Set login parameters my @hexstr=('0','1','2','3','4','5','6','7', @@ -162,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; @@ -182,20 +202,38 @@ ENDHEADER # ----------------------------------------------------------- Front page design my $pgbg= - ($fullgraph?&Apache::loncommon::designparm('login.pgbg'):'#FFFFFF'); + ($fullgraph?&Apache::loncommon::designparm('login.pgbg',$domain):'#FFFFFF'); my $font= - ($fullgraph?&Apache::loncommon::designparm('login.font'):'#000000'); + ($fullgraph?&Apache::loncommon::designparm('login.font',$domain):'#000000'); my $link= - ($fullgraph?&Apache::loncommon::designparm('login.link'):'#0000FF'); + ($fullgraph?&Apache::loncommon::designparm('login.link',$domain):'#0000FF'); my $vlink= - ($fullgraph?&Apache::loncommon::designparm('login.vlink'):'#0000FF'); - my $alink=&Apache::loncommon::designparm('login.alink'); + ($fullgraph?&Apache::loncommon::designparm('login.vlink',$domain):'#0000FF'); + my $alink=&Apache::loncommon::designparm('login.alink',$domain); my $mainbg= - ($fullgraph?&Apache::loncommon::designparm('login.mainbg'):'#FFFFFF'); + ($fullgraph?&Apache::loncommon::designparm('login.mainbg',$domain):'#FFFFFF'); my $sidebg= - ($fullgraph?&Apache::loncommon::designparm('login.sidebg'):'#FFFFFF'); - my $logo=&Apache::loncommon::designparm('login.logo'); - my $img=&Apache::loncommon::designparm('login.img'); + ($fullgraph?&Apache::loncommon::designparm('login.sidebg',$domain):'#FFFFFF'); + 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 @@ -263,6 +301,8 @@ ENDSCRIPT + + ENDSERVERFORM if ($fullgraph) { $r->print(< - Accessibility Options + Accessibility Options
- About LON-CAPA + About LON-CAPA @@ -304,7 +344,7 @@ ENDSERVERFORM - +
@@ -320,7 +360,7 @@ ENDSERVERFORM ENDTOP } else { - $r->print('

The LearningOnline Network with CAPA

Text-based Interface Login

'); + $r->print('

The LearningOnline Network with CAPA

Text-based Interface Login

'.$announcements); } $r->print('
'); unless ($fullgraph) { @@ -352,24 +392,24 @@ ENDNOOPT - + - + - + - + - +
User Authentication
User Authentication

   User Name:
   $lt{'un'}:
   Password:   $lt{'pw'}:
   Domain:   $lt{'dom'}:
   Help   $lt{'help'}
- +
@@ -383,6 +423,9 @@ ENDLOGIN + +$announcements + @@ -394,7 +437,7 @@ ENDLOGIN + + + +
-    Domain:  +    $lt{'dom'}:   $domain @@ -402,7 +445,7 @@ ENDLOGIN
-    Server:  +    $lt{'serv'}:   $lonhost ($role) @@ -410,19 +453,28 @@ ENDLOGIN
-    Load:  +    $lt{'load'}:  + +  $loadpercent $lt{'perc'} +
+    $lt{'userload'}:  -  $loadpercent percent +  $userloadpercent $lt{'perc'}

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