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

version 1.25, 2002/10/14 16:14:58 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']);       ($ENV{'QUERY_STRING'}.'&'.$ENV{'request.querystring'},
         ['interface','username','domain','firsturl']);
    
   # ----------------------------------------------------------- Process Interface
     $ENV{'form.interface'}=~s/\W//g;      $ENV{'form.interface'}=~s/\W//g;
   
     my $fullgraph=($ENV{'form.interface'} ne 'textual');      my $textbrowsers=$r->dir_config('lonTextBrowsers');
       my $httpbrowser=$ENV{"HTTP_USER_AGENT"};
       
       foreach (split(/\:/,$textbrowsers)) {
    if ($httpbrowser=~/$_/i) {
       $ENV{'form.interface'}='textual';
           }
       }
   
     my $iconpath= $r->dir_config('lonIconsURL');      my $fullgraph=($ENV{'form.interface'} ne 'textual');
       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 $domain  = $r->dir_config('lonDefDomain');
     my $role    = $r->dir_config('lonRole');      my $role    = $r->dir_config('lonRole');
     my $loadlim = $r->dir_config('lonLoadLim');      my $loadlim = $r->dir_config('lonLoadLim');
Line 65  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
   
       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');
        $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
     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') &&
         $otherserver=Apache::lonnet::spareserver($loadpercent);   (($userloadpercent>100.0)||($loadpercent>100.0))) {
           $otherserver=Apache::lonnet::spareserver($loadpercent,$userloadpercent);
     }      }
   
 # -------------------------------------------------------- Set login parameters  # -------------------------------------------------------- Set login parameters
Line 101  sub handler { Line 127  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();
       $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
Line 119  ENDHEADER Line 181  ENDHEADER
     }      }
   
 # ----------------------------------------------------------- Front page design  # ----------------------------------------------------------- Front page design
     my $pgbg=&Apache::loncommon::designparm('login.pgbg');      my $pgbg=
     my $font=&Apache::loncommon::designparm('login.font');        ($fullgraph?&Apache::loncommon::designparm('login.pgbg'):'#FFFFFF');
     my $link=&Apache::loncommon::designparm('login.link');      my $font=
     my $vlink=&Apache::loncommon::designparm('login.vlink');        ($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 $alink=&Apache::loncommon::designparm('login.alink');
     my $mainbg=&Apache::loncommon::designparm('login.mainbg');      my $mainbg=
     my $sidebg=&Apache::loncommon::designparm('login.sidebg');        ($fullgraph?&Apache::loncommon::designparm('login.mainbg'):'#FFFFFF');
       my $sidebg=
         ($fullgraph?&Apache::loncommon::designparm('login.sidebg'):'#FFFFFF');
     my $logo=&Apache::loncommon::designparm('login.logo');      my $logo=&Apache::loncommon::designparm('login.logo');
     my $img=&Apache::loncommon::designparm('login.img');      my $img=&Apache::loncommon::designparm('login.img');
   
Line 134  ENDHEADER Line 202  ENDHEADER
     $r->print(<<ENDSCRIPT);      $r->print(<<ENDSCRIPT);
   
 <body bgcolor="$pgbg" text="$font" link="$link" vlink="$vlink" alink="$alink"  <body bgcolor="$pgbg" text="$font" link="$link" vlink="$vlink" alink="$alink"
  onLoad="init();" topmargin=0 leftmargin=0 marginwidth=0 marginheight=0>    topmargin=0 leftmargin=0 marginwidth=0 marginheight=0>
   
  <script language="JavaScript">   <script language="JavaScript">
     function send()      function send()
Line 145  ENDHEADER Line 213  ENDHEADER
         this.document.server.elements.udom.value          this.document.server.elements.udom.value
        =this.document.client.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;          uextkey=this.document.client.elements.uextkey.value;
         lextkey=this.document.client.elements.lextkey.value;          lextkey=this.document.client.elements.lextkey.value;
         initkeys();          initkeys();
Line 165  ENDSCRIPT Line 251  ENDSCRIPT
   
     $r->print(<<ENDSERVERFORM);      $r->print(<<ENDSERVERFORM);
   <form name="server" action="$otherserver/adm/authenticate" method="post" target="_top">    <form name="server" action="$otherserver/adm/authenticate" method="post" target="_top">
    <input type=hidden name=logtoken value="$logtoken">     <input type="hidden" name="logtoken" value="$logtoken" />
    <input type=hidden name=serverid value="$lonhost">     <input type="hidden" name="serverid" value="$lonhost" />
    <input type=hidden name=interface value="$ENV{'form.interface'}">     <input type="hidden" name="interface" value="$ENV{'form.interface'}" />
    <input type=hidden name=uname value="">     <input type="hidden" name="uname" value="" />
    <input type=hidden name=upass value="">     <input type="hidden" name="upass" value="" />
    <input type=hidden name=udom value="">     <input type="hidden" name="udom" value="" />
      <input type="hidden" name="imagesuppress"  value="" />
      <input type="hidden" name="appletsuppress"  value="" />
      <input type="hidden" name="embedsuppress"  value="" />
      <input type="hidden" name="fontenhance"  value="" />
      <input type="hidden" name="blackwhite"  value="" />
      <input type="hidden" name="remember"  value="" />
   </form>    </form>
 ENDSERVERFORM  ENDSERVERFORM
     if ($fullgraph) { $r->print(<<ENDTOP);      if ($fullgraph) { $r->print(<<ENDTOP);
Line 178  ENDSERVERFORM Line 270  ENDSERVERFORM
   <tr>    <tr>
   
    <!-- Row 1 Columns 2-4 -->     <!-- Row 1 Columns 2-4 -->
    <td width="100%" height=75 colspan=4 align="left" valign="top" bgcolor="#006600"><img src="$img" border=0 alt="The Learning Online Network with CAPA" /></td>     <td width="100%" height=75 colspan=4 align="left" valign="top" bgcolor="$pgbg"><img src="$img" border=0 alt="The Learning Online Network with CAPA" /></td>
   </tr>    </tr>
   
   <!-- The gray bar that starts the two table frames -->    <!-- The gray bar that starts the two table frames -->
Line 227  ENDSERVERFORM Line 319  ENDSERVERFORM
    <!-- Row 4 Column 1 -->     <!-- Row 4 Column 1 -->
    <td align="center" valign="middle" bgcolor="$sidebg">     <td align="center" valign="middle" bgcolor="$sidebg">
 ENDTOP  ENDTOP
   } else {
       $r->print('<h1>The Learning<i>Online</i> Network with CAPA</h1><h2>Text-based Interface Login</h2>');
   }
       $r->print('<form name="client" onsubmit="return(send())">');
       unless ($fullgraph) {
           $r->print(<<ENDACCESSOPTIONS);
   <h3>Select Accessibility Options</h3>
   <input type="checkbox" name="imagesuppress" /> Suppress rendering of images<br />
   <input type="checkbox" name="appletsuppress" /> Suppress Java applets<br />
   <input type="checkbox" name="embedsuppress" /> Suppress rendering of embedded multimedia<br />
   <input type="checkbox" name="fontenhance" /> Increase font size<br />
   <input type="checkbox" name="blackwhite" /> Switch to black and white mode<br />
   <p>If you have accessibility needs that are not addressed by this interface, 
   please
   contact the system administrator at <tt>$sysadm</tt>.</p><br />
   <input type="checkbox" name="remember" /> Remember these settings for next login<hr />
   ENDACCESSOPTIONS
   } else {
       $r->print(<<ENDNOOPT);
   <input type="hidden" name="imagesuppress"  value="" />
   <input type="hidden" name="embedsuppress"  value="" />
   <input type="hidden" name="appletsuppress"  value="" />
   <input type="hidden" name="fontenhance"  value="" />
   <input type="hidden" name="blackwhite"  value="" />
   <input type="hidden" name="remember"  value="" />
   ENDNOOPT
 }  }
     $r->print(<<ENDLOGIN);      $r->print(<<ENDLOGIN);
     <form name="client" onsubmit="return(send())">  
      <input type="hidden" name="lextkey" value="$lextkey">       <input type="hidden" name="lextkey" value="$lextkey">
      <input type="hidden" name="uextkey" value="$uextkey">       <input type="hidden" name="uextkey" value="$uextkey">
   
Line 238  ENDTOP Line 355  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 246  ENDTOP Line 363  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" valign="bottom" align="center" colspan=2>         <td bgcolor="$mainbg">&nbsp;&nbsp;&nbsp;<a href="/adm/loginproblems.html">Help</a></td>
          <td bgcolor="$mainbg" valign="bottom" align="center">
         <br />          <br />
         <input type="submit" value="Log In" />          <input type="submit" value="Log In" />
        </td>         </td>

Removed from v.1.25  
changed lines
  Added in v.1.41


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