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

Diff for /loncom/auth/lonlogin.pm between versions 1.94 and 1.99

version 1.94, 2007/08/30 22:07:45 version 1.99, 2008/01/24 14:30:28
Line 30  package Apache::lonlogin; Line 30  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 69  sub handler { Line 68  sub handler {
   
   
 # -------------------------------- Prevent users from attempting to login twice  # -------------------------------- Prevent users from attempting to login twice
     my %cookies=CGI::Cookie->parse($r->header_in('Cookie'));      my $handle = &Apache::lonnet::check_for_valid_session($r);
     my $lonid=$cookies{'lonID'};      if ($handle=~/^publicuser\_/) {
     my $cookie;  
     if ($lonid) {  
  my $handle=&LONCAPA::clean_handle($lonid->value);  
         my $lonidsdir=$r->dir_config('lonIDsDir');  
  if (-e "$lonidsdir/$handle.id") {  
 # Is there an existing token file?  
     if ($handle=~/^publicuser\_/) {  
 # For "public user" - remove it, we apparently really want to login  # For "public user" - remove it, we apparently really want to login
  unlink("$lonidsdir/$handle.id");   unlink($r->dir_config('lonIDsDir')."/$handle.id");
     } elsif ($handle ne '') {      } elsif ($handle ne '') {
 # Indeed, a valid token is found  # Indeed, a valid token is found
  my $start_page =    my $start_page = 
     &Apache::loncommon::start_page('Already logged in');      &Apache::loncommon::start_page('Already logged in');
  my $end_page =    my $end_page = 
     &Apache::loncommon::end_page();      &Apache::loncommon::end_page();
  $r->print(<<ENDFAILED);   $r->print(<<ENDFAILED);
 $start_page  $start_page
 <h1>You are already logged in</h1>  <h1>You are already logged in</h1>
 <p>Please either <a href="/adm/roles">continue the current session</a> or  <p>Please either <a href="/adm/roles">continue the current session</a> or
Line 95  $start_page Line 87  $start_page
 <a href="/adm/loginproblems.html">Problems?</a></p>  <a href="/adm/loginproblems.html">Problems?</a></p>
 $end_page  $end_page
 ENDFAILED  ENDFAILED
                 return OK;          return OK;
      }    
  }  
     }      }
   
 # ---------------------------------------------------- No valid token, continue  # ---------------------------------------------------- No valid token, continue
Line 158  ENDFAILED Line 148  ENDFAILED
     my $otherserver= &Apache::lonnet::absolute_url($host_name);      my $otherserver= &Apache::lonnet::absolute_url($host_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 overloaded?
     if (($role eq 'access') &&      if ((($userloadpercent>100.0)||($loadpercent>100.0))) {
  (($userloadpercent>100.0)||($loadpercent>100.0))) {  
         my $unloaded=Apache::lonnet::spareserver($loadpercent,$userloadpercent);          my $unloaded=Apache::lonnet::spareserver($loadpercent,$userloadpercent);
  if ($unloaded) { $otherserver=$unloaded; }   if ($unloaded) { $otherserver=$unloaded; }
     }      }
Line 246  ENDTROUBLE Line 235  ENDTROUBLE
 # ----------------------------------------------- Apparently we are in business  # ----------------------------------------------- Apparently we are in business
     $servadm=~s/\,/\<br \/\>/g;      $servadm=~s/\,/\<br \/\>/g;
   
 # --------------------------------------------------- Print login screen header  
     $r->print(<<ENDHEADER);  
 <html>  
 <head>  
 <meta HTTP-EQUIV="Refresh" CONTENT="$expire; url=/adm/roles" />  
 <title>The LearningOnline Network with CAPA Login</title>  
 </head>  
 ENDHEADER  
 # ---------------------------------------------------- Serve out DES JavaScript  
     {  
  my $jsh=Apache::File->new($include."/londes.js");  
         $r->print(<$jsh>);  
     }  
   
 # ----------------------------------------------------------- Front page design  # ----------------------------------------------------------- Front page design
     my $pgbg=      my $pgbg=
       ($fullgraph?&Apache::loncommon::designparm('login.pgbg',$domain):'#FFFFFF');        ($fullgraph?&Apache::loncommon::designparm('login.pgbg',$domain):'#FFFFFF');
Line 274  ENDHEADER Line 249  ENDHEADER
       ($fullgraph?&Apache::loncommon::designparm('login.mainbg',$domain):'#FFFFFF');        ($fullgraph?&Apache::loncommon::designparm('login.mainbg',$domain):'#FFFFFF');
     my $sidebg=      my $sidebg=
       ($fullgraph?&Apache::loncommon::designparm('login.sidebg',$domain):'#FFFFFF');        ($fullgraph?&Apache::loncommon::designparm('login.sidebg',$domain):'#FFFFFF');
       my $textcol = 
         ($fullgraph?&Apache::loncommon::designparm('login.textcol',$domain):'#000000');
       my $bgcol =
         ($fullgraph?&Apache::loncommon::designparm('login.bgcol',$domain):'#FFFFFF');
     my $logo=&Apache::loncommon::designparm('login.logo',$domain);      my $logo=&Apache::loncommon::designparm('login.logo',$domain);
     my $img=&Apache::loncommon::designparm('login.img',$domain);      my $img=&Apache::loncommon::designparm('login.img',$domain);
     my $domainlogo=&Apache::loncommon::domainlogo($domain);      my $domainlogo=&Apache::loncommon::domainlogo($domain);
     my $showadminmail=&Apache::loncommon::designparm('login.adminmail',                                                      $domain);      my $login=&Apache::loncommon::designparm('login.login',$domain);
       if ($login eq '') {
           $login = $iconpath.'/'.&mt('userauthentication.gif');
       }
       my $showadminmail=&Apache::loncommon::designparm('login.adminmail',$domain);
     my $showcoursecat =      my $showcoursecat =
         &Apache::loncommon::designparm('login.coursecatalog',$domain);          &Apache::loncommon::designparm('login.coursecatalog',$domain);
       my $loginheader =&Apache::loncommon::designparm('login.loginheader',$domain);
   
 # ----------------------------------------------------------------------- Texts  
   
 my %lt=&Apache::lonlocal::texthash(  
   'un'  => 'Username',  
   'pw'  => 'Password',  
   'dom' => 'Domain',  
   'perc' => 'percent',  
   'load' => 'Load',  
                   'userload' => 'User Load',  
                   'about'  => 'About LON-CAPA',  
                   'access' => 'Accessibility Options',  
                   'catalog' => 'Course Catalog',  
   'auth' => 'userauthentication.gif',  
   'log' => 'Log in',  
   'help' => 'Log-in Help',  
   'serv' => 'Server',  
                   'servadm' => 'Server Administration',  
                   'helpdesk' => 'Contact Helpdesk',  
                   'forgotpw' => 'Forgot password?');  
 # -------------------------------------------------- Change password field name  
     my $now=time;      my $now=time;
     my $forgotpw = &forgotpwdisplay(%lt);      my $js = (<<ENDSCRIPT);
     my $loginhelp = &loginhelpdisplay(%lt);  
 # ---------------------------------------------------------- Serve rest of page  
     $r->print(<<ENDSCRIPT);  
   
 <body bgcolor="$pgbg" text="$font" link="$link" vlink="$vlink" alink="$alink"  
   topmargin=0 leftmargin=0 marginwidth=0 marginheight=0>  
   
  <script language="JavaScript">   <script language="JavaScript">
     function send()      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;
   
         this.document.server.elements.udom.value          this.document.server.elements.udom.value
Line 343  my %lt=&Apache::lonlocal::texthash( Line 299  my %lt=&Apache::lonlocal::texthash(
         initkeys();          initkeys();
   
         this.document.server.elements.upass0.value          this.document.server.elements.upass0.value
     =crypted(this.document.client.elements.upass$now.value.substr(0,15));              =crypted(this.document.client.elements.upass$now.value.substr(0,15));
  this.document.server.elements.upass1.value          this.document.server.elements.upass1.value
     =crypted(this.document.client.elements.upass$now.value.substr(15,15));              =crypted(this.document.client.elements.upass$now.value.substr(15,15));
  this.document.server.elements.upass2.value          this.document.server.elements.upass2.value
     =crypted(this.document.client.elements.upass$now.value.substr(30,15));              =crypted(this.document.client.elements.upass$now.value.substr(30,15));
   
         this.document.client.elements.uname.value='';          this.document.client.elements.uname.value='';
         this.document.client.elements.upass$now.value='';          this.document.client.elements.upass$now.value='';
   
         this.document.server.submit();          this.document.server.submit();
  return false;          return false;
     }      }
  </script>   </script>
   
 ENDSCRIPT  ENDSCRIPT
   
   # --------------------------------------------------- Print login screen header
   
       my %add_entries = (topmargin    => "0",
                          leftmargin   => "0",
                          marginheight => "0",
                          marginwidth  => "0",
                          bgcolor      => "$pgbg",
                          text         => "$font",
                          link         => "$link",
                          vlink        => "$vlink",
                          alink        => "$alink",);
   
       $r->print(&Apache::loncommon::start_page('The LearningOnline Network with CAPA Login',$js,
                                          { 'redirect'       => [$expire,'/adm/roles'], 
                                            'add_entries' => \%add_entries,
                                            'only_body'   => 1,}));
   
   # ----------------------------------------------------------------------- Texts
   
   my %lt=&Apache::lonlocal::texthash(
     'un'  => 'Username',
     'pw'  => 'Password',
     'dom' => 'Domain',
     'perc' => 'percent',
     'load' => 'Load',
                     'userload' => 'User Load',
                     'about'  => 'About LON-CAPA',
                     'access' => 'Accessibility Options',
                     'catalog' => 'Course Catalog',
     'log' => 'Log in',
     'help' => 'Log-in Help',
     'serv' => 'Server',
                     'servadm' => 'Server Administration',
                     'helpdesk' => 'Contact Helpdesk',
                     'forgotpw' => 'Forgot password?',
                     'options_headline' => 'Select Accessibility Options',
                     'sprs_img' => 'Suppress rendering of images',
                     'sprs_applet' => 'Suppress Java applets',
                     'sprs_embed' => 'Suppress rendering of embedded multimedia',
                     'sprs_font' => 'Increase font size',
                     'sprs_blackwhite' => 'Switch to black and white mode',
                     'remember' => 'Remember these settings for next login');
   # -------------------------------------------------- Change password field name
       my $forgotpw = &forgotpwdisplay(%lt);
       my $loginhelp = &loginhelpdisplay(%lt);
   
   # ---------------------------------------------------- Serve out DES JavaScript
       {
           my $jsh=Apache::File->new($include."/londes.js");
           $r->print(<$jsh>);
       }
   # ---------------------------------------------------------- Serve rest of page
   
     if ($fullgraph) {      if ($fullgraph) {
  $r->print(   $r->print(
   '<table width="100%" cellpadding=0 cellspacing=0 border=0>');    '<table width="100%" cellpadding=0 cellspacing=0 border=0>');
Line 451  ENDSERVERFORM Line 461  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>'.$announcements);      $r->print('<h1>The Learning<i>Online</i> Network with CAPA</h1>'
                .'<h2>'.&mt('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) {
         $r->print(<<ENDACCESSOPTIONS);          $r->print(<<ENDACCESSOPTIONS);
 <h3>Select Accessibility Options</h3>  <h3>$lt{'options_headline'}</h3>
 <label><input type="checkbox" name="imagesuppress" /> Suppress rendering of images</label><br />  <label><input type="checkbox" name="imagesuppress" /> $lt{'sprs_img'}</label><br />
 <label><input type="checkbox" name="appletsuppress" /> Suppress Java applets</label><br />  <label><input type="checkbox" name="appletsuppress" /> $lt{'sprs_applet'}</label><br />
 <label><input type="checkbox" name="embedsuppress" /> Suppress rendering of embedded multimedia</label><br />  <label><input type="checkbox" name="embedsuppress" /> $lt{'sprs_embed'}</label><br />
 <label><input type="checkbox" name="fontenhance" /> Increase font size</label><br />  <label><input type="checkbox" name="fontenhance" /> $lt{'sprs_font'}</label><br />
 <label><input type="checkbox" name="blackwhite" /> Switch to black and white mode</label><br />  <label><input type="checkbox" name="blackwhite" /> $lt{'sprs_blackwhite'}</label><br />
 <input type="checkbox" name="remember" /> Remember these settings for next login<hr />  <br />
   <input type="checkbox" name="remember" /> $lt{'remember'}<hr />
 ENDACCESSOPTIONS  ENDACCESSOPTIONS
 } else {  } else {
     $r->print(<<ENDNOOPT);      $r->print(<<ENDNOOPT);
Line 474  ENDACCESSOPTIONS Line 487  ENDACCESSOPTIONS
 <input type="hidden" name="remember"  value="" />  <input type="hidden" name="remember"  value="" />
 ENDNOOPT  ENDNOOPT
 }  }
       my $logintitle;
       if ($loginheader eq 'text') {
           $logintitle = '<td bgcolor="'.$bgcol.'" colspan="2">&nbsp;&nbsp;&nbsp;<b><font size="+1" color="'.$textcol.'">'.$lt{'log'}.'</font></b></td>';
       } else {
           $logintitle = '<td bgcolor="'.$sidebg.'" colspan="2"><img src="'.$login.'" alt="'.
                         &mt('User Authentication').'" /></td>';
       }
     $r->print(<<ENDLOGIN);      $r->print(<<ENDLOGIN);
      <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">
   
      <!-- 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/$lt{'auth'}" alt="User Authentication" /></td></tr>        <tr>$logintitle</tr>
       <tr>        <tr>
        <td bgcolor="$mainbg"><br /><font size=-1><b>&nbsp;&nbsp;&nbsp;<label for="uname">$lt{'un'}</label>:</b></font></td>         <td bgcolor="$mainbg"><br /><font size=-1><b>&nbsp;&nbsp;&nbsp;<label for="uname">$lt{'un'}</label>:</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 604  $helpdeskscript Line 624  $helpdeskscript
   
 ENDDOCUMENT  ENDDOCUMENT
 }  }
     $r->print('</body></html>');      my %endargs = ( 'noredirectlink' => 1, );
       $r->print(&Apache::loncommon::end_page(\%endargs));
     return OK;      return OK;
 }  }
   
Removed from v.1.94  
changed lines
  Added in v.1.99

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