--- loncom/auth/lonlogin.pm 2003/02/17 23:25:59 1.32 +++ loncom/auth/lonlogin.pm 2003/08/12 19:46:04 1.45 @@ -1,7 +1,7 @@ # The LearningOnline Network # Login Screen # -# $Id: lonlogin.pm,v 1.32 2003/02/17 23:25:59 www Exp $ +# $Id: lonlogin.pm,v 1.45 2003/08/12 19:46:04 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -50,8 +50,9 @@ sub handler { &Apache::loncommon::get_unprocessed_cgi - ($ENV{'QUERY_STRING'},['interface','username','domain','firsturl']); - + ($ENV{'QUERY_STRING'}.'&'.$ENV{'request.querystring'}, + ['interface','username','domain','firsturl','localpath','localres']); + # ----------------------------------------------------------- Process Interface $ENV{'form.interface'}=~s/\W//g; @@ -65,8 +66,11 @@ 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'); my $role = $r->dir_config('lonRole'); @@ -76,6 +80,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 +90,26 @@ 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))) { + $otherserver=Apache::lonnet::spareserver($loadpercent,$userloadpercent); } +# ----------------------------------------------------------- Get announcements + my $announcements=&Apache::lonnet::getannounce(); # -------------------------------------------------------- Set login parameters my @hexstr=('0','1','2','3','4','5','6','7', @@ -156,10 +166,14 @@ ENDTROUBLE # ----------------------------------------------- Apparently we are in business my $domainlogo=&Apache::loncommon::domainlogo(); + $servadm=~s/\,/\
/g; + $sysadm=~s/\,/\
/g; + # --------------------------------------------------- Print login screen header $r->print(< + The LearningOnline Network with CAPA Login ENDHEADER @@ -170,13 +184,19 @@ 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 $pgbg= + ($fullgraph?&Apache::loncommon::designparm('login.pgbg'):'#FFFFFF'); + my $font= + ($fullgraph?&Apache::loncommon::designparm('login.font'):'#000000'); + my $link= + ($fullgraph?&Apache::loncommon::designparm('login.link'):'#0000FF'); + my $vlink= + ($fullgraph?&Apache::loncommon::designparm('login.vlink'):'#0000FF'); my $alink=&Apache::loncommon::designparm('login.alink'); - my $mainbg=&Apache::loncommon::designparm('login.mainbg'); - my $sidebg=&Apache::loncommon::designparm('login.sidebg'); + my $mainbg= + ($fullgraph?&Apache::loncommon::designparm('login.mainbg'):'#FFFFFF'); + my $sidebg= + ($fullgraph?&Apache::loncommon::designparm('login.sidebg'):'#FFFFFF'); my $logo=&Apache::loncommon::designparm('login.logo'); my $img=&Apache::loncommon::designparm('login.img'); @@ -196,6 +216,24 @@ ENDHEADER this.document.server.elements.udom.value =this.document.client.elements.udom.value; + this.document.server.elements.imagesuppress.value + =this.document.client.elements.imagesuppress.checked; + + this.document.server.elements.embedsuppress.value + =this.document.client.elements.embedsuppress.checked; + + this.document.server.elements.appletsuppress.value + =this.document.client.elements.appletsuppress.checked; + + this.document.server.elements.fontenhance.value + =this.document.client.elements.fontenhance.checked; + + this.document.server.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; initkeys(); @@ -216,12 +254,20 @@ ENDSCRIPT $r->print(< - - - - - - + + + + + + + + + + + + + + ENDSERVERFORM if ($fullgraph) { $r->print(< - +
@@ -279,10 +325,33 @@ 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 + Suppress rendering of images
+ Suppress Java applets
+ Suppress rendering of embedded multimedia
+ Increase font size
+ 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(< @@ -319,6 +388,9 @@ ENDLOGIN + +$announcements + @@ -352,13 +424,22 @@ ENDLOGIN  $loadpercent percent + + +    User Load:  + + +  $userloadpercent percent + +
   System Administration:
      $sysadm
   Server Administration:
-       $servadm
  +       $servadm
 
+    $version