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

Diff for /loncom/auth/lonlogin.pm between versions 1.29 and 1.31

version 1.29, 2003/01/31 21:51:36 version 1.31, 2003/02/04 16:03:25
Line 50  sub handler { Line 50  sub handler {
   
   
     &Apache::loncommon::get_unprocessed_cgi      &Apache::loncommon::get_unprocessed_cgi
                          ($ENV{'QUERY_STRING'},['interface']);       ($ENV{'QUERY_STRING'},['interface','username','domain','firsturl']);
   
     $ENV{'form.interface'}=~s/\W//g;      $ENV{'form.interface'}=~s/\W//g;
   
Line 67  sub handler { Line 67  sub handler {
     my $tabdir  = $r->dir_config('lonTabDir');      my $tabdir  = $r->dir_config('lonTabDir');
     my $include = $r->dir_config('lonIncludes');      my $include = $r->dir_config('lonIncludes');
   
   # --------------------------------------------- Default values for login fields
   
       my $authusername=($ENV{'form.username'}?$ENV{'form.username'}:'');
       my $authdomain=($ENV{'form.domain'}?$ENV{'form.domain'}:$domain);
   
   # ---------------------------------------------------------- Determine own load
     my $loadavg;      my $loadavg;
    {     {
        my $loadfile=Apache::File->new('/proc/loadavg');         my $loadfile=Apache::File->new('/proc/loadavg');
Line 75  sub handler { Line 81  sub handler {
     $loadavg =~ s/\s.*//g;      $loadavg =~ s/\s.*//g;
     my $loadpercent=100*$loadavg/$loadlim;      my $loadpercent=100*$loadavg/$loadlim;
   
   # ------------------------------------------------------- Do the load balancing
     my $otherserver='http://'.$ENV{'SERVER_NAME'};      my $otherserver='http://'.$ENV{'SERVER_NAME'};
     my $firsturl=$ENV{'request.firsturl'};      my $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') && ($loadpercent>100.0)) {
         $otherserver=Apache::lonnet::spareserver($loadpercent);          $otherserver=Apache::lonnet::spareserver($loadpercent);
Line 102  sub handler { Line 110  sub handler {
     my $uextkey=hex($ukey);      my $uextkey=hex($ukey);
     if ($uextkey>2147483647) { $uextkey-=4294967296; }      if ($uextkey>2147483647) { $uextkey-=4294967296; }
   
   # -------------------------------------------------------- Store away log token
     my $logtoken=Apache::lonnet::reply(      my $logtoken=Apache::lonnet::reply(
        'tmpput:'.$ukey.$lkey.'&'.$firsturl,         'tmpput:'.$ukey.$lkey.'&'.$firsturl,
        $lonhost);         $lonhost);
   
   # ------------------- If we cannot talk to ourselves, we are in serious trouble
   
       if ($logtoken eq 'con_lost') {
           my $spares='';
           foreach (keys %Apache::lonnet::hostname) {
               if ($_ ne $lonhost) {
                  $spares.='<br /><a href="http://'.$Apache::lonnet::hostname{$_}.
    '/adm/login?domain='.$authdomain.'">'.
                    $Apache::lonnet::hostname{$_}.'</a>';
                  if ($Apache::lonnet::spareid{$_}) {
      $spares.=' (preferred)';
                  }
      }
           }
    $r->print(<<ENDTROUBLE);
   <html>
   <head><title>The LearningOnline Network with CAPA</title></head>
   <body bgcolor="#FFFFFF">
   <img src="/adm/lonKaputt/lonlogo_broken.gif" align="right" />
   <h3>This LON-CAPA server is temporarily not available for login</h3>
   <p>Please attempt to login to one of the following servers:</p>$spares
   <p>If the problem persists, please contact <tt>$servadm</tt>.</p>
   </body>
   </html>
   ENDTROUBLE
           return OK;
       }
   
   # ----------------------------------------------- Apparently we are in business
   
     my $domainlogo=&Apache::loncommon::domainlogo();      my $domainlogo=&Apache::loncommon::domainlogo();
 # --------------------------------------------------- Print login screen header  # --------------------------------------------------- Print login screen header
     $r->print(<<ENDHEADER);      $r->print(<<ENDHEADER);
Line 239  ENDTOP Line 279  ENDTOP
       <tr><td bgcolor="$sidebg" colspan=2><img src="$iconpath/userauthentication.gif" alt="User Authentication" /></td></tr>        <tr><td bgcolor="$sidebg" colspan=2><img src="$iconpath/userauthentication.gif" alt="User Authentication" /></td></tr>
       <tr>        <tr>
        <td bgcolor="$mainbg"><br /><font size=-1><b>&nbsp;&nbsp;&nbsp;User Name:</b></font></td>         <td bgcolor="$mainbg"><br /><font size=-1><b>&nbsp;&nbsp;&nbsp;User Name:</b></font></td>
        <td bgcolor="$mainbg"><br /><input type="text" name="uname" size="10" /></td>         <td bgcolor="$mainbg"><br /><input type="text" name="uname" size="10" value="$authusername" /></td>
       </tr>        </tr>
       <tr>        <tr>
        <td bgcolor="$mainbg"><font size=-1><b>&nbsp;&nbsp;&nbsp;Password:</b></font></td>         <td bgcolor="$mainbg"><font size=-1><b>&nbsp;&nbsp;&nbsp;Password:</b></font></td>
Line 247  ENDTOP Line 287  ENDTOP
       </tr>        </tr>
       <tr>        <tr>
        <td bgcolor="$mainbg"><font size=-1><b>&nbsp;&nbsp;&nbsp;Domain:</b></font></td>         <td bgcolor="$mainbg"><font size=-1><b>&nbsp;&nbsp;&nbsp;Domain:</b></font></td>
        <td bgcolor="$mainbg"><input type="text" name="udom" size="10" value=$domain /></td>         <td bgcolor="$mainbg"><input type="text" name="udom" size="10" value="$authdomain" /></td>
       </tr>        </tr>
       <tr>        <tr>
        <td bgcolor="$mainbg">&nbsp;&nbsp;&nbsp;<a href="/adm/loginproblems.html">Help</a></td>         <td bgcolor="$mainbg">&nbsp;&nbsp;&nbsp;<a href="/adm/loginproblems.html">Help</a></td>
Removed from v.1.29  
changed lines
  Added in v.1.31

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