Diff for /loncom/auth/lonlogin.pm between versions 1.39 and 1.55.2.1

version 1.39, 2003/04/02 14:57:32 version 1.55.2.1, 2004/01/27 23:40:31
Line 25 Line 25
 #  #
 # http://www.lon-capa.org/  # http://www.lon-capa.org/
 #  #
 # 5/21/99,5/22,5/25,5/26,5/31,6/2,6/10,7/12,7/14,  
 # 1/14/00,5/29,5/30,6/1,6/29,7/1,11/9,  
 # 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;
 use Apache::Constants qw(:common);  use Apache::Constants qw(:common);
   use CGI::Cookie();
 use Apache::File ();  use Apache::File ();
 use Apache::lonnet();  use Apache::lonnet();
 use Apache::loncommon();  use Apache::loncommon();
   use Apache::lonauth();
   use Apache::lonlocal;
   
 sub handler {  sub handler {
     my $r = shift;      my $r = shift;
     $r->content_type('text/html');  
     &Apache::loncommon::no_cache($r);      &Apache::loncommon::no_cache($r);
       &Apache::lonlocal::get_language_handle($r);
       &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;      $r->send_http_header;
     return OK if $r->header_only;      return OK if $r->header_only;
   
   
   # Are we re-routing?
       if (-e '/home/httpd/html/lon-status/reroute.txt') {
    &Apache::lonauth::reroute($r);
    return OK;
       }
   
   # -------------------------------- Prevent users from attempting to login twice
       my %cookies=CGI::Cookie->parse($r->header_in('Cookie'));
       my $lonid=$cookies{'lonID'};
       my $cookie;
       if ($lonid) {
    my $handle=$lonid->value;
           $handle=~s/\W//g;
           my $lonidsdir=$r->dir_config('lonIDsDir');
           if ((-e "$lonidsdir/$handle.id") && ($handle ne '')) {
   # Indeed, a valid token is found
       my $bodytag=&Apache::loncommon::bodytag('Already logged in');
       $r->print(<<ENDFAILED);
   <html>
   <head>
   <title>Already logged in</title>
   </head>
   <html>
   $bodytag
   <h1>You are already logged in</h1>
   <p>Please either <a href="/adm/roles">continue the current session</a> or
   <a href="/adm/logout">logout</a>.</p>
   <p>
   <a href="/adm/loginproblems.html">Problems?</a></p>
   </body>
   </html>
   ENDFAILED
              return OK;
    }
       }
   
   # ---------------------------------------------------- No valid token, continue
   
     &Apache::loncommon::get_unprocessed_cgi      &Apache::loncommon::get_unprocessed_cgi
      ($ENV{'QUERY_STRING'}.'&'.$ENV{'request.querystring'},       ($ENV{'QUERY_STRING'}.'&'.$ENV{'request.querystring'},
       ['interface','username','domain','firsturl']);        ['interface','username','domain','firsturl','localpath','localres']);
     
   
 # ----------------------------------------------------------- Process Interface  # ----------------------------------------------------------- Process Interface
     $ENV{'form.interface'}=~s/\W//g;      $ENV{'form.interface'}=~s/\W//g;
   
Line 66  sub handler { Line 102  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 $testdomain=(split(/\./,$ENV{'HTTP_HOST'}))[0];
       foreach my $posdom (values(%Apache::lonnet::hostdom)) {
    if ($posdom eq $testdomain) { $domain=$testdomain; }
       }
       if (($ENV{'form.domain'}) && 
    ($Apache::lonnet::domaindescription{$ENV{'form.domain'}})) {
    $domain=$ENV{'form.domain'};
       }
     my $role    = $r->dir_config('lonRole');      my $role    = $r->dir_config('lonRole');
     my $loadlim = $r->dir_config('lonLoadLim');      my $loadlim = $r->dir_config('lonLoadLim');
     my $servadm = $r->dir_config('lonAdmEMail');      my $servadm = $r->dir_config('lonAdmEMail');
Line 78  sub handler { Line 125  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');
     my $expire  = $r->dir_config('lonExpire');      my $expire  = $r->dir_config('lonExpire');
       my $version = $r->dir_config('lonVersion');
   
 # --------------------------------------------- Default values for login fields  # --------------------------------------------- Default values for login fields
   
Line 86  sub handler { Line 134  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))) {
           my $unloaded=Apache::lonnet::spareserver($loadpercent,$userloadpercent);
    if ($unloaded) { $otherserver=$unloaded; }
     }      }
   
   # ----------------------------------------------------------- Get announcements
       my $announcements=&Apache::lonnet::getannounce();
 # -------------------------------------------------------- Set login parameters  # -------------------------------------------------------- Set login parameters
   
     my @hexstr=('0','1','2','3','4','5','6','7',      my @hexstr=('0','1','2','3','4','5','6','7',
Line 157  ENDTROUBLE Line 210  ENDTROUBLE
   
 # ----------------------------------------------- Apparently we are in business  # ----------------------------------------------- Apparently we are in business
   
     my $domainlogo=&Apache::loncommon::domainlogo();      my $domainlogo=&Apache::loncommon::domainlogo($domain);
     $servadm=~s/\,/\<br \/\>/g;      $servadm=~s/\,/\<br \/\>/g;
     $sysadm=~s/\,/\<br \/\>/g;      $sysadm=~s/\,/\<br \/\>/g;
   
Line 177  ENDHEADER Line 230  ENDHEADER
   
 # ----------------------------------------------------------- Front page design  # ----------------------------------------------------------- Front page design
     my $pgbg=      my $pgbg=
       ($fullgraph?&Apache::loncommon::designparm('login.pgbg'):'#FFFFFF');        ($fullgraph?&Apache::loncommon::designparm('login.pgbg',$domain):'#FFFFFF');
     my $font=      my $font=
       ($fullgraph?&Apache::loncommon::designparm('login.font'):'#000000');        ($fullgraph?&Apache::loncommon::designparm('login.font',$domain):'#000000');
     my $link=      my $link=
       ($fullgraph?&Apache::loncommon::designparm('login.link'):'#0000FF');        ($fullgraph?&Apache::loncommon::designparm('login.link',$domain):'#0000FF');
     my $vlink=      my $vlink=
       ($fullgraph?&Apache::loncommon::designparm('login.vlink'):'#0000FF');        ($fullgraph?&Apache::loncommon::designparm('login.vlink',$domain):'#0000FF');
     my $alink=&Apache::loncommon::designparm('login.alink');      my $alink=&Apache::loncommon::designparm('login.alink',$domain);
     my $mainbg=      my $mainbg=
       ($fullgraph?&Apache::loncommon::designparm('login.mainbg'):'#FFFFFF');        ($fullgraph?&Apache::loncommon::designparm('login.mainbg',$domain):'#FFFFFF');
     my $sidebg=      my $sidebg=
       ($fullgraph?&Apache::loncommon::designparm('login.sidebg'):'#FFFFFF');        ($fullgraph?&Apache::loncommon::designparm('login.sidebg',$domain):'#FFFFFF');
     my $logo=&Apache::loncommon::designparm('login.logo');      my $logo=&Apache::loncommon::designparm('login.logo',$domain);
     my $img=&Apache::loncommon::designparm('login.img');      my $img=&Apache::loncommon::designparm('login.img',$domain);
   
   # ----------------------------------------------------------------------- Texts
   
   my %lt=&Apache::lonlocal::texthash(
     'un'  => 'Username',
     'pw'  => 'Password',
     'dom' => 'Domain',
     'perc' => 'percent',
     'load' => 'Load',
                     'userload' => 'User Load',
                     'about'  => 'aboutlon.gif',
                     'access' => 'accessbutton.gif',
     'auth' => 'userauthentication.gif',
     'log' => 'Log in',
     'help' => 'Help',
     'serv' => 'Server',
                     'servadm' => 'Server Administration',
                     'sysadm' => 'System Administration');
   
   
 # ---------------------------------------------------------- Serve rest of page  # ---------------------------------------------------------- Serve rest of page
Line 258  ENDSCRIPT Line 329  ENDSCRIPT
    <input type="hidden" name="fontenhance"  value="" />     <input type="hidden" name="fontenhance"  value="" />
    <input type="hidden" name="blackwhite"  value="" />     <input type="hidden" name="blackwhite"  value="" />
    <input type="hidden" name="remember"  value="" />     <input type="hidden" name="remember"  value="" />
      <input type="hidden" name="localpath" value="$ENV{'form.localpath'}" />
      <input type="hidden" name="localres" value="$ENV{'form.localres'}" />
   </form>    </form>
 ENDSERVERFORM  ENDSERVERFORM
     if ($fullgraph) { $r->print(<<ENDTOP);      if ($fullgraph) { $r->print(<<ENDTOP);
Line 288  ENDSERVERFORM Line 361  ENDSERVERFORM
    <!-- A cell that will hold the 'access' and 'about' buttons -->     <!-- A cell that will hold the 'access' and 'about' buttons -->
    <!-- Row 3 Column 1 -->     <!-- Row 3 Column 1 -->
    <td valign="top" height=60 align="center" bgcolor="$sidebg">     <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>      <a href="/adm/login?interface=textual"><img src="$iconpath/$lt{'access'}" border=0 alt="Accessibility Options" /></a>
     <br />      <br />
     <a href="/adm/about.html"><img src="$iconpath/aboutlon.gif" border=0 alt="About LON-CAPA" /></a>      <a href="/adm/about.html"><img src="$iconpath/$lt{'about'}" border=0 alt="About LON-CAPA" /></a>
    </td>     </td>
   
    <!-- The shaded space between the two main columns -->     <!-- The shaded space between the two main columns -->
Line 299  ENDSERVERFORM Line 372  ENDSERVERFORM
   
    <!-- The right main column holding the large LON-CAPA logo-->     <!-- The right main column holding the large LON-CAPA logo-->
    <!-- Rows 3-4 Column 3 -->     <!-- Rows 3-4 Column 3 -->
    <td align="center" valign="top" width="100%" height="100%" rowspan=2 bgcolor="$mainbg">     <td align="center" valign="top" width="100%" height="100%" bgcolor="$mainbg">
     <center>      <center>
      <img src="$logo" alt="" />       <img src="$logo" alt="" />
     </center>      </center>
Line 315  ENDSERVERFORM Line 388  ENDSERVERFORM
    <td align="center" valign="middle" bgcolor="$sidebg">     <td align="center" valign="middle" bgcolor="$sidebg">
 ENDTOP  ENDTOP
 } else {  } else {
     $r->print('<h1>The Learning<i>Online</i> Network with CAPA</h1><h2>Text-based Interface Login</h2>');      $r->print('<h1>The Learning<i>Online</i> Network with CAPA</h1><h2>Text-based Interface Login</h2>'.$announcements);
 }  }
     $r->print('<form name="client" onsubmit="return(send())">');      $r->print('<form name="client" onsubmit="return(send())">');
     unless ($fullgraph) {      unless ($fullgraph) {
Line 347  ENDNOOPT Line 420  ENDNOOPT
   
      <!-- Start the sub-table for text and input alignment -->       <!-- Start the sub-table for text and input alignment -->
      <table border=0 cellspacing=0 cellpadding=0>       <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="$sidebg" colspan=2><img src="$iconpath/$lt{'auth'}" 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;$lt{'un'}:</b></font></td>
        <td bgcolor="$mainbg"><br /><input type="text" name="uname" size="10" value="$authusername" /></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;$lt{'pw'}:</b></font></td>
        <td bgcolor="$mainbg"><input type="password" name="upass" size="10" /></td>         <td bgcolor="$mainbg"><input type="password" name="upass" size="10" /></td>
       </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;$lt{'dom'}:</b></font></td>
        <td bgcolor="$mainbg"><input type="text" name="udom" size="10" value="$authdomain" /></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">$lt{'help'}</a></td>
        <td bgcolor="$mainbg" valign="bottom" align="center">         <td bgcolor="$mainbg" valign="bottom" align="center">
         <br />          <br />
         <input type="submit" value="Log In" />          <input type="submit" value="$lt{'log'}" />
        </td>         </td>
       </tr>        </tr>
      </table>       </table>
Line 378  ENDLOGIN Line 451  ENDLOGIN
    <!-- Row 4 Column 2 -->     <!-- Row 4 Column 2 -->
    <td width=27 background="$iconpath/fillleft.gif"><img src="$iconpath/fillleft.gif" alt="" /></td>     <td width=27 background="$iconpath/fillleft.gif"><img src="$iconpath/fillleft.gif" alt="" /></td>
   
      <!-- Row 4 Column 3 -->
   <td bgcolor="$mainbg">$announcements</td>
   
    <!-- Row 4 Column 4 -->     <!-- Row 4 Column 4 -->
    <td width=27 background="$iconpath/fillright.gif"><img src="$iconpath/fillright.gif" alt="" /></td>     <td width=27 background="$iconpath/fillright.gif"><img src="$iconpath/fillright.gif" alt="" /></td>
   </tr>    </tr>
Line 389  ENDLOGIN Line 465  ENDLOGIN
      <table border=0 cellspacing=0 cellpadding=0>       <table border=0 cellspacing=0 cellpadding=0>
       <tr>        <tr>
        <td bgcolor="$sidebg" align="left" valign="top">         <td bgcolor="$sidebg" align="left" valign="top">
         <small><b>&nbsp;&nbsp;&nbsp;Domain:&nbsp;</b></small>          <small><b>&nbsp;&nbsp;&nbsp;$lt{'dom'}:&nbsp;</b></small>
        </td>         </td>
        <td bgcolor="$sidebg" align="left" valign="top">         <td bgcolor="$sidebg" align="left" valign="top">
         <small><tt>&nbsp;$domain</tt></small>          <small><tt>&nbsp;$domain</tt></small>
Line 397  ENDLOGIN Line 473  ENDLOGIN
       </tr>        </tr>
       <tr>        <tr>
        <td bgcolor="$sidebg" align="left" valign="top">         <td bgcolor="$sidebg" align="left" valign="top">
         <small><b>&nbsp;&nbsp;&nbsp;Server:&nbsp;</b></small>          <small><b>&nbsp;&nbsp;&nbsp;$lt{'serv'}:&nbsp;</b></small>
        </td>         </td>
        <td bgcolor="$sidebg" align="left" valign="top">         <td bgcolor="$sidebg" align="left" valign="top">
         <small><tt>&nbsp;$lonhost ($role)</tt></small>          <small><tt>&nbsp;$lonhost ($role)</tt></small>
Line 405  ENDLOGIN Line 481  ENDLOGIN
       </tr>        </tr>
       <tr>        <tr>
        <td bgcolor="$sidebg" align="left" valign="top">         <td bgcolor="$sidebg" align="left" valign="top">
         <small><b>&nbsp;&nbsp;&nbsp;Load:&nbsp;</b></small>          <small><b>&nbsp;&nbsp;&nbsp;$lt{'load'}:&nbsp;</b></small>
          </td>
          <td bgcolor="$sidebg" align="left" valign="top">
           <small><tt>&nbsp;$loadpercent $lt{'perc'}</tt></small>
          </td>
         </tr>
         <tr>
          <td bgcolor="$sidebg" align="left" valign="top">
           <small><b>&nbsp;&nbsp;&nbsp;$lt{'userload'}:&nbsp;</b></small>
        </td>         </td>
        <td bgcolor="$sidebg" align="left" valign="top">         <td bgcolor="$sidebg" align="left" valign="top">
         <small><tt>&nbsp;$loadpercent percent</tt></small>          <small><tt>&nbsp;$userloadpercent $lt{'perc'}</tt></small>
        </td>         </td>
       </tr>        </tr>
      </table>       </table>
      <br />       <br />
     <small>      <small>
      <b>&nbsp;&nbsp;&nbsp;System Administration:</b><br />       <b>&nbsp;&nbsp;&nbsp;$lt{'sysadm'}:</b><br />
      <tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;$sysadm</tt><br />       <tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;$sysadm</tt><br />
      <b>&nbsp;&nbsp;&nbsp;Server Administration:</b><br />       <b>&nbsp;&nbsp;&nbsp;$lt{'servadm'}:</b><br />
      <tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;$servadm<br />&nbsp;</tt>       <tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;$servadm</tt><br />&nbsp;<br />
        &nbsp;&nbsp;&nbsp;$version
     </small>      </small>
    </td>     </td>
   

Removed from v.1.39  
changed lines
  Added in v.1.55.2.1


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