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

Diff for /loncom/auth/lonlogin.pm between versions 1.51 and 1.55.2.2

version 1.51, 2003/09/17 02:24:14 version 1.55.2.2, 2005/04/28 01:25:08
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();
Line 45  use Apache::lonlocal; Line 39  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;
   
Line 57  sub handler { Line 52  sub handler {
  return OK;   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','localpath','localres']);        ['interface','username','domain','firsturl','localpath','localres']);
     
 # -------------------------------------------------------------------- Language  
   
     &Apache::lonlocal::get_language_handle();  
   
 # ----------------------------------------------------------- Process Interface  # ----------------------------------------------------------- Process Interface
     $ENV{'form.interface'}=~s/\W//g;      $ENV{'form.interface'}=~s/\W//g;
Line 85  sub handler { Line 109  sub handler {
     my $iconpath= 'http://'.$ENV{'HTTP_HOST'}.':'.$port_to_use.      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 (lc($posdom) eq lc($testdomain)) { $domain=$testdomain; }
       }
     if (($ENV{'form.domain'}) &&       if (($ENV{'form.domain'}) && 
  ($Apache::lonnet::domaindescription{$ENV{'form.domain'}})) {   ($Apache::lonnet::domaindescription{$ENV{'form.domain'}})) {
  $domain=$ENV{'form.domain'};   $domain=$ENV{'form.domain'};
Line 224  my %lt=&Apache::lonlocal::texthash( Line 252  my %lt=&Apache::lonlocal::texthash(
   'pw'  => 'Password',    'pw'  => 'Password',
   'dom' => 'Domain',    'dom' => 'Domain',
   'perc' => 'percent',    'perc' => 'percent',
   'user' => 'User',    'load' => 'Load',
   'load' => 'load',                    'userload' => 'User Load',
                     'about'  => 'aboutlon.gif',
                     'access' => 'accessbutton.gif',
     'auth' => 'userauthentication.gif',
   'log' => 'Log in',    'log' => 'Log in',
   'help' => 'Help',    'help' => 'Help',
   'serv' => 'Server',    'serv' => 'Server',
Line 330  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 389  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;$lt{'un'}:</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>
Line 450  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>
        <td bgcolor="$sidebg" align="left" valign="top">         <td bgcolor="$sidebg" align="left" valign="top">
         <small><tt>&nbsp;$loadpercent $lt{'perc'}</tt></small>          <small><tt>&nbsp;$loadpercent $lt{'perc'}</tt></small>
Line 458  ENDLOGIN Line 489  ENDLOGIN
       </tr>        </tr>
       <tr>        <tr>
        <td bgcolor="$sidebg" align="left" valign="top">         <td bgcolor="$sidebg" align="left" valign="top">
         <small><b>&nbsp;&nbsp;&nbsp;$lt{'user'}&nbsp;$lt{'load'}:&nbsp;</b></small>          <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;$userloadpercent $lt{'perc'}</tt></small>          <small><tt>&nbsp;$userloadpercent $lt{'perc'}</tt></small>
Removed from v.1.51  
changed lines
  Added in v.1.55.2.2

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