Diff for /loncom/auth/lonlogin.pm between versions 1.12 and 1.22

version 1.12, 2002/02/19 21:20:48 version 1.22, 2002/09/17 19:45:11
Line 29 Line 29
 # 1/14/00,5/29,5/30,6/1,6/29,7/1,11/9,  # 1/14/00,5/29,5/30,6/1,6/29,7/1,11/9,
 # 1/17/01 Gerd Kortemeyer  # 1/17/01 Gerd Kortemeyer
 #  #
   # 2/7/02,2/8,2/12,2/14,2/15,2/19 Josh Brunskole
   # 
   # 7/10/02 Jeremy Bowers
   
 package Apache::lonlogin;  package Apache::lonlogin;
   
 use strict;  use strict;
Line 44  sub handler { Line 48  sub handler {
     $r->send_http_header;      $r->send_http_header;
     return OK if $r->header_only;      return OK if $r->header_only;
   
   
       &Apache::loncommon::get_unprocessed_cgi
                            ($ENV{'QUERY_STRING'},['interface']);
   
       $ENV{'form.interface'}=~s/\W//g;
   
       my $fullgraph=($ENV{'form.interface'} ne 'textual');
   
     my $iconpath= $r->dir_config('lonIconsURL');      my $iconpath= $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 65  sub handler { Line 77  sub handler {
     my $otherserver='http://'.$ENV{'SERVER_NAME'};      my $otherserver='http://'.$ENV{'SERVER_NAME'};
     my $firsturl=$ENV{'request.firsturl'};      my $firsturl=$ENV{'request.firsturl'};
 # ---------------------------------------- Are we access server and overloaded?  # ---------------------------------------- Are we access server and overloaded?
     if (($role eq 'access') && ($loadpercent>100.0)) {      if (($loadpercent>100.0)) {
         $otherserver=Apache::lonnet::spareserver();          $otherserver=Apache::lonnet::spareserver($loadpercent);
     }      }
   
 # -------------------------------------------------------- Set login parameters  # -------------------------------------------------------- Set login parameters
Line 84  sub handler { Line 96  sub handler {
     }      }
   
     my $lextkey=hex($lkey);      my $lextkey=hex($lkey);
       if ($lextkey>2147483647) { $lextkey-=4294967296; }
   
     my $uextkey=hex($ukey);      my $uextkey=hex($ukey);
       if ($uextkey>2147483647) { $uextkey-=4294967296; }
   
     my $logtoken=Apache::lonnet::reply(      my $logtoken=Apache::lonnet::reply(
        'tmpput:'.$ukey.$lkey.'&'.$firsturl,         'tmpput:'.$ukey.$lkey.'&'.$firsturl,
        $lonhost);         $lonhost);
       my $domainlogo=&Apache::loncommon::domainlogo();
 # --------------------------------------------------- Print login screen header  # --------------------------------------------------- Print login screen header
     $r->print(<<ENDHEADER);      $r->print(<<ENDHEADER);
 <html>  <html>
Line 101  ENDHEADER Line 117  ENDHEADER
  my $jsh=Apache::File->new($include."/londes.js");   my $jsh=Apache::File->new($include."/londes.js");
         $r->print(<$jsh>);          $r->print(<$jsh>);
     }      }
 # ---------------------------------------------------------- Serve rest of page  
     $r->print(<<ENDDOCUMENT);  
   
 <body bgcolor="#FFFFFF" text="#000000" link="#999999" vlink="#999999"  # ----------------------------------------------------------- Front page design
  onLoad="init();">      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 $alink=&Apache::loncommon::designparm('login.alink');
       my $mainbg=&Apache::loncommon::designparm('login.mainbg');
       my $sidebg=&Apache::loncommon::designparm('login.sidebg');
       my $logo=&Apache::loncommon::designparm('login.logo');
       my $img=&Apache::loncommon::designparm('login.img');
   
 <script language="JavaScript">  
   
     function send() {  # ---------------------------------------------------------- Serve rest of page
       $r->print(<<ENDSCRIPT);
   
   <body bgcolor="$pgbg" text="$font" link="$link" vlink="$vlink" alink="$alink"
    onLoad="init();" topmargin=0 leftmargin=0 marginwidth=0 marginheight=0>
   
    <script language="JavaScript">
       function send()
       {
  this.document.server.elements.uname.value   this.document.server.elements.uname.value
        =this.document.client.elements.uname.value;         =this.document.client.elements.uname.value;
   
Line 124  ENDHEADER Line 153  ENDHEADER
     =crypted(this.document.client.elements.upass.value);      =crypted(this.document.client.elements.upass.value);
   
         this.document.server.submit();          this.document.server.submit();
    return false;
     }      }
    </script>
   ENDSCRIPT
   
 </script>      if ($fullgraph) {
    $r->print(
     '<table width="100%" cellpadding=0 cellspacing=0 border=0>');
       }
   
       $r->print(<<ENDSERVERFORM);
     <form name="server" action="$otherserver/adm/authenticate" method="post" target="_top">
      <input type=hidden name=logtoken value="$logtoken">
      <input type=hidden name=serverid value="$lonhost">
      <input type=hidden name=interface value="$ENV{'form.interface'}">
      <input type=hidden name=uname value="">
      <input type=hidden name=upass value="">
      <input type=hidden name=udom value="">
     </form>
   ENDSERVERFORM
       if ($fullgraph) { $r->print(<<ENDTOP);
     <!-- The LON-CAPA Header -->
     <tr>
   
      <!-- 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>
     </tr>
   
     <!-- The gray bar that starts the two table frames -->
     <tr>
   
      <!-- Row 2 Column 1 -->
      <td width=182 height=27 bgcolor="$sidebg">&nbsp;</td>
   
      <!-- Row 2 Column 2 -->
      <td width=27 height=27 align="left" background="$iconpath/filltop.gif"><img src="$iconpath/upperleft.gif" border=0 alt="" /></td>
   
      <!-- Row 2 Column 3 -->
      <td height=27 background="$iconpath/filltop.gif"><img src="$iconpath/filltop.gif" alt="" /></td>
   
      <!-- Row 2 Column 4 -->
      <td width=27 height=27 align="right" background="$iconpath/filltop.gif"><img src="$iconpath/upperright.gif" border=0 alt="" /></td>
     </tr>
     <tr>
      
      <!-- A cell that will hold the 'access' and 'about' buttons -->
      <!-- Row 3 Column 1 -->
      <td valign="top" height=60 align="center" bgcolor="$sidebg">
       <a href="/adm/login?interface=textual"><img src="$iconpath/accessbutton.gif" border=0 alt="Accessibility Options" /></a>
       <br />
       <a href="/adm/about.html"><img src="$iconpath/aboutlon.gif" border=0 alt="About LON-CAPA" /></a>
      </td>
   
      <!-- The shaded space between the two main columns -->
      <!-- Row 3 Column 2 -->
      <td width=27 height=60 background="$iconpath/fillleft.gif"><img src="$iconpath/fillleft.gif" alt="" /></td>
   
      <!-- The right main column holding the large LON-CAPA logo-->
      <!-- Rows 3-4 Column 3 -->
      <td align="center" valign="top" width="100%" height="100%" rowspan=2 bgcolor="$mainbg">
       <center>
        <img src="$logo" alt="" />
       </center>
      </td>
   
      <!-- Row 3 Column 4 -->
      <td width=27 background="$iconpath/fillright.gif"><img src="$iconpath/fillright.gif" alt="" /></td>
     </tr>
     <tr>
   
      <!-- The entry form -->
      <!-- Row 4 Column 1 -->
      <td align="center" valign="middle" bgcolor="$sidebg">
   ENDTOP
   }
       $r->print(<<ENDLOGIN);
       <form name="client" onsubmit="return(send())">
        <input type="hidden" name="lextkey" value="$lextkey">
        <input type="hidden" name="uextkey" value="$uextkey">
   
        <!-- Start the sub-table for text and input alignment -->
        <table border=0 cellspacing=0 cellpadding=0>
         <tr><td bgcolor="$sidebg" colspan=2><img src="$iconpath/userauthentication.gif" alt="User Authentication" /></td></tr>
         <tr>
          <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>
         </tr>
         <tr>
          <td bgcolor="$mainbg"><font size=-1><b>&nbsp;&nbsp;&nbsp;Password:</b></font></td>
          <td bgcolor="$mainbg"><input type="password" name="upass" size="10" /></td>
         </tr>
         <tr>
          <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>
         </tr>
         <tr>
          <td bgcolor="$mainbg" valign="bottom" align="center" colspan=2>
           <br />
           <input type="submit" value="Log In" />
          </td>
         </tr>
        </table>
        <!-- End sub-table -->
       </form>
   ENDLOGIN
       if ($fullgraph) {
    $r->print(<<ENDDOCUMENT);
      </td>
   
      <!-- Row 4 Column 2 -->
      <td width=27 background="$iconpath/fillleft.gif"><img src="$iconpath/fillleft.gif" alt="" /></td>
   
      <!-- Row 4 Column 4 -->
      <td width=27 background="$iconpath/fillright.gif"><img src="$iconpath/fillright.gif" alt="" /></td>
     </tr>
     <tr>
   
      <!-- Row 5 Column 1 -->
      <td bgcolor="$sidebg" valign="middle" align="left">
        <br />
        <table border=0 cellspacing=0 cellpadding=0>
         <tr>
          <td bgcolor="$sidebg" align="left" valign="top">
           <small><b>&nbsp;&nbsp;&nbsp;Domain:&nbsp;</b></small>
          </td>
          <td bgcolor="$sidebg" align="left" valign="top">
           <small><tt>&nbsp;$domain</tt></small>
          </td>
         </tr>
         <tr>
          <td bgcolor="$sidebg" align="left" valign="top">
           <small><b>&nbsp;&nbsp;&nbsp;Server:&nbsp;</b></small>
          </td>
          <td bgcolor="$sidebg" align="left" valign="top">
           <small><tt>&nbsp;$lonhost ($role)</tt></small>
          </td>
         </tr>
         <tr>
          <td bgcolor="$sidebg" align="left" valign="top">
           <small><b>&nbsp;&nbsp;&nbsp;Load:&nbsp;</b></small>
          </td>
          <td bgcolor="$sidebg" align="left" valign="top">
           <small><tt>&nbsp;$loadpercent percent</tt></small>
          </td>
         </tr>
        </table>
        <br />
       <small>
        <b>&nbsp;&nbsp;&nbsp;System Administration:</b><br />
        <tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;$sysadm</tt><br />
        <b>&nbsp;&nbsp;&nbsp;Server Administration:</b><br />
        <tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;$servadm<br />&nbsp;</tt>
       </small>
      </td>
   
      <!-- Row 5 Column 2 -->
      <td width=27 background="$iconpath/fillleft.gif"><img src="$iconpath/fillleft.gif" alt="" /></td>
   
      <!-- Row 5 Column 3 -->
      <td width="100%" valign="bottom" bgcolor="$mainbg">
   $domainlogo
   </td>
   
 <a href="/adm/accessibility.html">Accessibility Options</a>     <!-- Row 5 Column 4 -->
 &nbsp;&nbsp;     <td width=27 background="$iconpath/fillright.gif"><img src="$iconpath/fillright.gif" alt="" /></td>
 <a href="/adm/about.html">About LON-CAPA</a><p>    </tr>
 <table width=600>    <tr>
 <tr><td>  
 <img src="$iconpath/lonlogo.gif"></td>     <!-- Row 6 Column 1 -->
 <td colspan=2 bgcolor="#DDDDDD">     <td bgcolor="$sidebg">&nbsp;</td>
 <font size=+1><b>User Authentication</b></font><p>  
      <!-- Row 6 Column 2 -->
  <form name="server" action="$otherserver/adm/authenticate"      <td align="left" background="$iconpath/fillbottom.gif"><img src="$iconpath/lowerleft.gif" alt="" /></td>
   method="post" target="_top">  
   <input type=hidden name=logtoken value="$logtoken">     <!-- Row 6 Column 3 -->
   <input type=hidden name=serverid value="$lonhost">     <td background="$iconpath/fillbottom.gif"><img src="$iconpath/fillbottom.gif" alt="" /></td>
   <input type=hidden name=uname value="">  
   <input type=hidden name=upass value="">     <!-- Row 6 Column 4 -->
   <input type=hidden name=udom value="">     <td align="right" background="$iconpath/fillbottom.gif"><img src="$iconpath/lowerright.gif" alt="" /></td>
  </form>    </tr>
   
  <form name="client">  
  <table border=2 bgcolor="#BBBBBB">  
  <tr><td>Username:</td><td><input type=text size=10 name=uname></td></tr>  
  <tr><td>Password:</td><td><input type=password size=10 name=upass></td></tr>  
  <tr><td>Domain:</td><td><input type=text size=10 value=$domain name=udom></td>  
  </tr>  
  <tr><td colspan=2><input type=button value=Login onClick="send();"></td></tr>  
  </table>   </table>
  <input type=hidden name=lextkey value="$lextkey">  
  <input type=hidden name=uextkey value="$uextkey">  
  </form>  
   
 </td>  
 </tr><tr><td bgcolor="#DDDDDD">  
 <table border=1 bgcolor="#BBBBBB">  
 <tr><td><font size="-1"><b>Domain:</b></font></td>  
     <td><font size="-1"><tt>$domain</tt></font></td>  
     <td rowspan=3><font size="-1"><b>System Administration:</b><br>  
                   <tt>$sysadm</tt><br>  
                   <b>Server Administration:</b><br>  
                   <tt>$servadm</tt></font></td></tr>  
 <tr><td><font size="-1"><b>Server:</b></font></td>  
     <td><font size="-1"><tt>$lonhost ($role)</tt></font></td></tr>  
 <tr><td><font size="-1"><b>Load:</b></font></td>  
     <td><font size="-1"><tt>$loadpercent</tt> percent</font></td></tr>  
 </table>  
 </td><td>  
 <font size="+1">  
 <b>L</b>aboratory&nbsp;for<br>  
 <b>I</b>nstructional<br>  
 <b>T</b>echnology&nbsp;in<br>  
 <b>E</b>ducation</td><td>  
 <img src="$iconpath/liteani.gif"></font></td></tr></table>  
 </body>  
 </html>  
 ENDDOCUMENT  ENDDOCUMENT
   }
       $r->print('</body></html>');
     return OK;      return OK;
 }   } 
   

Removed from v.1.12  
changed lines
  Added in v.1.22


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