--- loncom/auth/lonlogin.pm 2003/02/18 21:11:17 1.34 +++ loncom/auth/lonlogin.pm 2003/09/17 02:24:14 1.51 @@ -1,7 +1,7 @@ # The LearningOnline Network # Login Screen # -# $Id: lonlogin.pm,v 1.34 2003/02/18 21:11:17 www Exp $ +# $Id: lonlogin.pm,v 1.51 2003/09/17 02:24:14 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,8 +51,19 @@ 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'},['interface','username','domain','firsturl']); + ($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; @@ -65,10 +78,17 @@ sub handler { } my $fullgraph=($ENV{'form.interface'} ne 'textual'); - - my $iconpath= 'http://'.$ENV{'HTTP_HOST'}.':8080'. + my $port_to_use=$r->dir_config('lonhttpdPort'); + if (!defined($port_to_use)) { + $port_to_use='8080'; + } + 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'); @@ -76,6 +96,8 @@ sub handler { my $lonhost = $r->dir_config('lonHostID'); 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 @@ -84,22 +106,27 @@ sub handler { # ---------------------------------------------------------- Determine own load my $loadavg; - { - my $loadfile=Apache::File->new('/proc/loadavg'); - $loadavg=<$loadfile>; - } + { + my $loadfile=Apache::File->new('/proc/loadavg'); + $loadavg=<$loadfile>; + } $loadavg =~ s/\s.*//g; my $loadpercent=100*$loadavg/$loadlim; + my $userloadpercent=&Apache::lonnet::userload(); # ------------------------------------------------------- Do the load balancing my $otherserver='http://'.$ENV{'SERVER_NAME'}; my $firsturl= ($ENV{'request.firsturl'}?$ENV{'request.firsturl'}:$ENV{'form.firsturl'}); # ---------------------------------------- Are we access server and overloaded? - if (($role eq 'access') && ($loadpercent>100.0)) { - $otherserver=Apache::lonnet::spareserver($loadpercent); + if (($role eq 'access') && + (($userloadpercent>100.0)||($loadpercent>100.0))) { + 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', @@ -155,11 +182,15 @@ ENDTROUBLE # ----------------------------------------------- Apparently we are in business - my $domainlogo=&Apache::loncommon::domainlogo(); + my $domainlogo=&Apache::loncommon::domainlogo($domain); + $servadm=~s/\,/\
/g; + $sysadm=~s/\,/\
/g; + # --------------------------------------------------- Print login screen header $r->print(< + The LearningOnline Network with CAPA Login ENDHEADER @@ -170,15 +201,36 @@ ENDHEADER } # ----------------------------------------------------------- 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'); + my $pgbg= + ($fullgraph?&Apache::loncommon::designparm('login.pgbg',$domain):'#FFFFFF'); + my $font= + ($fullgraph?&Apache::loncommon::designparm('login.font',$domain):'#000000'); + my $link= + ($fullgraph?&Apache::loncommon::designparm('login.link',$domain):'#0000FF'); + my $vlink= + ($fullgraph?&Apache::loncommon::designparm('login.vlink',$domain):'#0000FF'); + my $alink=&Apache::loncommon::designparm('login.alink',$domain); + my $mainbg= + ($fullgraph?&Apache::loncommon::designparm('login.mainbg',$domain):'#FFFFFF'); + my $sidebg= + ($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', + 'user' => 'User', + 'load' => 'load', + 'log' => 'Log in', + 'help' => 'Help', + 'serv' => 'Server', + 'servadm' => 'Server Administration', + 'sysadm' => 'System Administration'); # ---------------------------------------------------------- Serve rest of page @@ -197,19 +249,22 @@ ENDHEADER =this.document.client.elements.udom.value; this.document.server.elements.imagesuppress.value - =this.document.client.elements.imagesuppress.value; + =this.document.client.elements.imagesuppress.checked; this.document.server.elements.embedsuppress.value - =this.document.client.elements.embedsuppress.value; + =this.document.client.elements.embedsuppress.checked; this.document.server.elements.appletsuppress.value - =this.document.client.elements.appletsuppress.value; + =this.document.client.elements.appletsuppress.checked; this.document.server.elements.fontenhance.value - =this.document.client.elements.fontenhance.value; + =this.document.client.elements.fontenhance.checked; this.document.server.elements.blackwhite.value - =this.document.client.elements.blackwhite.value; + =this.document.client.elements.blackwhite.checked; + + this.document.server.elements.remember.value + =this.document.client.elements.remember.checked; uextkey=this.document.client.elements.uextkey.value; lextkey=this.document.client.elements.lextkey.value; @@ -242,6 +297,9 @@ ENDSCRIPT + + + ENDSERVERFORM if ($fullgraph) { $r->print(< - +
@@ -299,20 +357,21 @@ 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) { $r->print(< -Select Accessibility Options - - +

Select Accessibility Options

Suppress rendering of images
Suppress Java applets
Suppress rendering of embedded multimedia
Increase font size
- Switch to black and white mode
+ Switch to black and white mode
+

If you have accessibility needs that are not addressed by this interface, +please +contact the system administrator at $sysadm.


+ Remember these settings for next login
ENDACCESSOPTIONS } else { $r->print(< + ENDNOOPT } $r->print(< User Authentication -
   User Name: +
   $lt{'un'}:
-    Password: +    $lt{'pw'}: -    Domain: +    $lt{'dom'}: -    Help +    $lt{'help'}
- + @@ -360,6 +420,9 @@ ENDLOGIN + +$announcements + @@ -371,7 +434,7 @@ ENDLOGIN + + + +
-    Domain:  +    $lt{'dom'}:   $domain @@ -379,7 +442,7 @@ ENDLOGIN
-    Server:  +    $lt{'serv'}:   $lonhost ($role) @@ -390,16 +453,25 @@ ENDLOGIN    Load:  -  $loadpercent percent +  $loadpercent $lt{'perc'} +
+    $lt{'user'} $lt{'load'}:  + +  $userloadpercent $lt{'perc'}

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