[BACK]Return to lonlogin.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / auth

Diff for /loncom/auth/lonlogin.pm between versions 1.36 and 1.41

version 1.36, 2003/02/20 01:35:27 version 1.41, 2003/05/08 21:50:54
Line 50  sub handler { Line 50  sub handler {
   
   
     &Apache::loncommon::get_unprocessed_cgi      &Apache::loncommon::get_unprocessed_cgi
      ($ENV{'QUERY_STRING'},['interface','username','domain','firsturl']);       ($ENV{'QUERY_STRING'}.'&'.$ENV{'request.querystring'},
         ['interface','username','domain','firsturl']);
    
 # ----------------------------------------------------------- Process Interface  # ----------------------------------------------------------- Process Interface
     $ENV{'form.interface'}=~s/\W//g;      $ENV{'form.interface'}=~s/\W//g;
   
Line 65  sub handler { Line 66  sub handler {
     }      }
   
     my $fullgraph=($ENV{'form.interface'} ne 'textual');      my $fullgraph=($ENV{'form.interface'} ne 'textual');
       my $port_to_use=$r->dir_config('lonhttpdPort');
     my $iconpath= 'http://'.$ENV{'HTTP_HOST'}.':8080'.      if (!defined($port_to_use)) {
    $port_to_use='8080';
       }
       my $iconpath= 'http://'.$ENV{'HTTP_HOST'}.':'.$port_to_use.
                   $r->dir_config('lonIconsURL');                    $r->dir_config('lonIconsURL');
     my $domain  = $r->dir_config('lonDefDomain');      my $domain  = $r->dir_config('lonDefDomain');
     my $role    = $r->dir_config('lonRole');      my $role    = $r->dir_config('lonRole');
Line 76  sub handler { Line 80  sub handler {
     my $lonhost = $r->dir_config('lonHostID');      my $lonhost = $r->dir_config('lonHostID');
     my $tabdir  = $r->dir_config('lonTabDir');      my $tabdir  = $r->dir_config('lonTabDir');
     my $include = $r->dir_config('lonIncludes');      my $include = $r->dir_config('lonIncludes');
       my $expire  = $r->dir_config('lonExpire');
   
 # --------------------------------------------- Default values for login fields  # --------------------------------------------- Default values for login fields
   
Line 84  sub handler { Line 89  sub handler {
   
 # ---------------------------------------------------------- Determine own load  # ---------------------------------------------------------- Determine own load
     my $loadavg;      my $loadavg;
    {      {
        my $loadfile=Apache::File->new('/proc/loadavg');   my $loadfile=Apache::File->new('/proc/loadavg');
        $loadavg=<$loadfile>;   $loadavg=<$loadfile>;
    }      }
     $loadavg =~ s/\s.*//g;      $loadavg =~ s/\s.*//g;
     my $loadpercent=100*$loadavg/$loadlim;      my $loadpercent=100*$loadavg/$loadlim;
       my $userloadpercent=&Apache::lonnet::userload();
   
 # ------------------------------------------------------- Do the load balancing  # ------------------------------------------------------- Do the load balancing
     my $otherserver='http://'.$ENV{'SERVER_NAME'};      my $otherserver='http://'.$ENV{'SERVER_NAME'};
     my $firsturl=      my $firsturl=
     ($ENV{'request.firsturl'}?$ENV{'request.firsturl'}:$ENV{'form.firsturl'});      ($ENV{'request.firsturl'}?$ENV{'request.firsturl'}:$ENV{'form.firsturl'});
 # ---------------------------------------- Are we access server and overloaded?  # ---------------------------------------- Are we access server and overloaded?
     if (($role eq 'access') && ($loadpercent>100.0)) {      if (($role eq 'access') &&
         $otherserver=Apache::lonnet::spareserver($loadpercent);   (($userloadpercent>100.0)||($loadpercent>100.0))) {
           $otherserver=Apache::lonnet::spareserver($loadpercent,$userloadpercent);
     }      }
   
 # -------------------------------------------------------- Set login parameters  # -------------------------------------------------------- Set login parameters
Line 156  ENDTROUBLE Line 163  ENDTROUBLE
 # ----------------------------------------------- Apparently we are in business  # ----------------------------------------------- Apparently we are in business
   
     my $domainlogo=&Apache::loncommon::domainlogo();      my $domainlogo=&Apache::loncommon::domainlogo();
       $servadm=~s/\,/\<br \/\>/g;
       $sysadm=~s/\,/\<br \/\>/g;
   
 # --------------------------------------------------- Print login screen header  # --------------------------------------------------- Print login screen header
     $r->print(<<ENDHEADER);      $r->print(<<ENDHEADER);
 <html>  <html>
 <head>  <head>
   <meta HTTP-EQUIV="Refresh" CONTENT="$expire; url=/adm/roles" />
 <title>The LearningOnline Network with CAPA Login</title>  <title>The LearningOnline Network with CAPA Login</title>
 </head>  </head>
 ENDHEADER  ENDHEADER
Removed from v.1.36  
changed lines
  Added in v.1.41

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>