--- loncom/auth/lonlogin.pm 2003/02/19 14:05:28 1.35 +++ loncom/auth/lonlogin.pm 2003/09/02 22:28:19 1.48 @@ -1,7 +1,7 @@ # The LearningOnline Network # Login Screen # -# $Id: lonlogin.pm,v 1.35 2003/02/19 14:05:28 www Exp $ +# $Id: lonlogin.pm,v 1.48 2003/09/02 22:28:19 albertel 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,10 +66,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 +84,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 +94,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 +170,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 @@ -171,20 +190,20 @@ 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); # ---------------------------------------------------------- Serve rest of page @@ -203,22 +222,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.value; + =this.document.client.elements.remember.checked; uextkey=this.document.client.elements.uextkey.value; lextkey=this.document.client.elements.lextkey.value; @@ -252,6 +271,8 @@ ENDSCRIPT + + ENDSERVERFORM if ($fullgraph) { $r->print(< - +
@@ -309,7 +330,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) { @@ -372,6 +393,9 @@ ENDLOGIN + +$announcements + @@ -405,13 +429,22 @@ ENDLOGIN  $loadpercent percent + + +    User Load:  + + +  $userloadpercent percent + +
   System Administration:
      $sysadm
   Server Administration:
-       $servadm
  +       $servadm
 
+    $version