Diff for /loncom/auth/lonauth.pm between versions 1.20 and 1.26

version 1.20, 2001/07/25 01:44:53 version 1.26, 2001/10/08 22:37:50
Line 6 Line 6
 # 7/1,7/10,10/2,10/5,10/9,10/26,10/30,11/10,  # 7/1,7/10,10/2,10/5,10/9,10/26,10/30,11/10,
 # 05/28,05/29 Gerd Kortemeyer  # 05/28,05/29 Gerd Kortemeyer
 # 07/24 Scott Harrison  # 07/24 Scott Harrison
   # 07/28,08/03 Gerd Kortemeyer
   # 8/15 Scott Harrison
   # 8/20 Gerd Kortemeyer
   
 package Apache::lonauth;  package Apache::lonauth;
   
Line 14  use Apache::Constants qw(:common); Line 17  use Apache::Constants qw(:common);
 use Apache::File;  use Apache::File;
 use CGI qw(:standard);  use CGI qw(:standard);
 use CGI::Cookie();  use CGI::Cookie();
   use DynaLoader; # for Crypt::DES version
 use Crypt::DES;  use Crypt::DES;
 use Apache::lonnet();  use Apache::lonnet();
 use Apache::lonmenu();  use Apache::lonmenu();
Line 121  sub success { Line 125  sub success {
   
 # ------------------------------------------------- Check for critical messages  # ------------------------------------------------- Check for critical messages
   
     my @what=&Apache::lonnet::dump('critical');      my @what=&Apache::lonnet::dump('critical',$domain,$username);
     if ($what[0]) {      if ($what[0]) {
  if ($what[0] ne 'con_lost') {   if (($what[0] ne 'con_lost') && ($what[0]!~/^error\:/)) {
     $lowerurl='/adm/email/critical/'.$what[0];      $lowerurl='/adm/email?critical=display';
         }          }
     }      }
   
Line 171  function wait() { Line 175  function wait() {
 }  }
   
 function main() {  function main() {
    canceltim=setTimeout('tim=1;',20000);     canceltim=setTimeout('tim=1;',80000);
    checkdef();     checkdef();
    wait();     wait();
 }  }
Line 256  sub handler { Line 260  sub handler {
   
     my $keybin=pack("H16",$key);      my $keybin=pack("H16",$key);
   
     my $cipher=new DES $keybin;      my $cipher;
       if ($Crypt::DES::VERSION>=2.03) {
    $cipher=new Crypt::DES $keybin;
       }
       else {
    $cipher=new DES $keybin;
       }
   
     my $upass=$cipher->decrypt(      my $upass=$cipher->decrypt(
        unpack("a8",pack("H16",substr($FORM{'upass'},0,16))));         unpack("a8",pack("H16",substr($FORM{'upass'},0,16))));
Line 279  sub handler { Line 289  sub handler {
     }      }
   
     if (($firsturl eq '') || ($firsturl eq '/adm/logout')) {      if (($firsturl eq '') || ($firsturl eq '/adm/logout')) {
  $firsturl='/res/adm/pages/index.html';   $firsturl='/adm/roles';
     }      }
   
     success($r,$FORM{'uname'},$FORM{'udom'},$authhost,$firsturl);      success($r,$FORM{'uname'},$FORM{'udom'},$authhost,$firsturl);

Removed from v.1.20  
changed lines
  Added in v.1.26


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